diff options
| author | joerg <joerg@pkgsrc.org> | 2013-03-02 17:57:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-03-02 17:57:08 +0000 |
| commit | f269a6fe62144240361fd5b5fc7925f3b1d5028f (patch) | |
| tree | e73850686b922c8ec6de6b9b7a97c6de290cb2e9 | |
| parent | 60549bf838b306ddad18c082d3b63b551645b039 (diff) | |
| download | pkgsrc-f269a6fe62144240361fd5b5fc7925f3b1d5028f.tar.gz | |
Use vector instead of variable length array of non-POD type.
| -rw-r--r-- | security/steghide/distinfo | 3 | ||||
| -rw-r--r-- | security/steghide/patches/patch-src_BmpFile.cc | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/security/steghide/distinfo b/security/steghide/distinfo index 55d7509ed8a..2567f0c8918 100644 --- a/security/steghide/distinfo +++ b/security/steghide/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2011/12/06 19:47:32 joerg Exp $ +$NetBSD: distinfo,v 1.6 2013/03/02 17:57:08 joerg Exp $ SHA1 (steghide-0.5.1.tar.gz) = a6d204744fabfe5751ab5e2d889ac373c0b0a30c RMD160 (steghide-0.5.1.tar.gz) = e17507444b8bb91e6e29d46ec02fa39f7f2f44e8 @@ -14,4 +14,5 @@ SHA1 (patch-ah) = c19a9ae3976147704c7e0b45f437c12ecd850c77 SHA1 (patch-ai) = 9ae6443ee9a997a859456a712327cc7d17ede0f4 SHA1 (patch-aj) = 36039401484d85cec20bc157b29f55e219a762b3 SHA1 (patch-ak) = 404abb1935208b9eba9711677e1514154486543b +SHA1 (patch-src_BmpFile.cc) = fb2c6ac488ddb50f993ac9179a557ccda393b7f5 SHA1 (patch-src_Graph.cc) = 211d2607ccb5b9c4de0a91497a14376d89e0fe63 diff --git a/security/steghide/patches/patch-src_BmpFile.cc b/security/steghide/patches/patch-src_BmpFile.cc new file mode 100644 index 00000000000..fb28c9f0111 --- /dev/null +++ b/security/steghide/patches/patch-src_BmpFile.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-src_BmpFile.cc,v 1.1 2013/03/02 17:57:08 joerg Exp $ + +--- src/BmpFile.cc.orig 2013-03-01 15:07:01.000000000 +0000 ++++ src/BmpFile.cc +@@ -214,10 +214,10 @@ std::vector<SampleValueAdjacencyList*> B + // create reservoir - for every i reservoir[i] contains the sample values that are neighbourss of + // the sample value with label i and have a lower label (and have already been found) + // This is necessary to use collapsing trees together with bucket sort (without huge increase in memory usage) +- std::vector<BmpRGBSampleValue*> reservoir[svs.size()] ; ++ std::vector< std::vector<BmpRGBSampleValue*> > reservoir(svs.size()) ; + + // neighbours sorted by distance (for the current source sample value) +- std::vector<BmpRGBSampleValue*> neighbours_byd[r + 1] ; ++ std::vector< std::vector<BmpRGBSampleValue*> > neighbours_byd(r + 1) ; + + for (std::vector<SampleValue*>::const_iterator srcsvit = svs.begin() ; srcsvit != svs.end() ; srcsvit++) { + BmpRGBSampleValue* srcsv = (BmpRGBSampleValue*) (*srcsvit) ; |