pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/darktable Passing non-POD arguments to varidi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fb709db500ca
branches: trunk
changeset: 358711:fb709db500ca
user: joerg <joerg%pkgsrc.org@localhost>
date: Sat Feb 18 23:17:02 2017 +0000
description:
Passing non-POD arguments to varidic functions is not portable.
diffstat:
graphics/darktable/distinfo | 13 +++++-
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp | 21 ++++++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h | 15 +++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp | 13 ++++++
graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp | 13 ++++++
12 files changed, 165 insertions(+), 1 deletions(-)
diffs (220 lines):
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/distinfo
--- a/graphics/darktable/distinfo Sat Feb 18 23:16:26 2017 +0000
+++ b/graphics/darktable/distinfo Sat Feb 18 23:17:02 2017 +0000
@@ -1,7 +1,18 @@
-$NetBSD: distinfo,v 1.26 2016/12/23 03:53:16 ryoon Exp $
+$NetBSD: distinfo,v 1.27 2017/02/18 23:17:02 joerg Exp $
SHA1 (darktable-2.0.7.tar.xz) = c9392af5df0045b36b89c6548b9ff552f34b7e15
RMD160 (darktable-2.0.7.tar.xz) = 6d9e7bf1507e2e25a3359bc0b853fb62e4078b26
SHA512 (darktable-2.0.7.tar.xz) = 568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928
Size (darktable-2.0.7.tar.xz) = 2960436 bytes
SHA1 (patch-src_develop_blend.c) = d8b5d72fac9544b37e856c57d511423483c14a9b
+SHA1 (patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp) = c1c7f8b03f63295361138ec1d6dbd1d323fa69ba
+SHA1 (patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp) = 435e99db5d512f6568048a8e6382f6def6e7430f
+SHA1 (patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp) = 3abfbca5078d1ed068199e96e16b8eaea4eb662d
+SHA1 (patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h) = 952924510be16009083b2bdbdeeda84770321c79
+SHA1 (patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp) = ba539af74fb071b5a826702a085e5c03e4f2b763
+SHA1 (patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp) = c3a7445a0e978d615171b5ffa363be74ffafe93e
+SHA1 (patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp) = 1eb97b59d1110334d67200e4b9e26b411a5bbd8b
+SHA1 (patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp) = a2e9162e6242633690ada9939bff8b459da18fb6
+SHA1 (patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp) = 3f4b15e56c2e6e77ed18f8479f6e4f3cf5effa23
+SHA1 (patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp) = 26870733cb6399095f56ca6caa820990a8572c0a
+SHA1 (patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp) = 6d81b0e758a1a7b84b8f510ff670dfb948881f78
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_AriDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/AriDecoder.cpp.orig 2017-02-18 19:40:48.711688335 +0000
++++ src/external/rawspeed/RawSpeed/AriDecoder.cpp
+@@ -104,7 +104,7 @@ void AriDecoder::checkSupportInternal(Ca
+ }
+
+ void AriDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_GREEN, CFA_RED, CFA_BLUE, CFA_GREEN2);
++ mRaw->cfa.setCFA(2, 2, CFA_GREEN, CFA_RED, CFA_BLUE, CFA_GREEN2);
+ mRaw->metadata.wbCoeffs[0] = mWB[0];
+ mRaw->metadata.wbCoeffs[1] = mWB[1];
+ mRaw->metadata.wbCoeffs[2] = mWB[2];
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_ArwDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/ArwDecoder.cpp.orig 2017-02-18 19:40:50.868914278 +0000
++++ src/external/rawspeed/RawSpeed/ArwDecoder.cpp
+@@ -257,7 +257,7 @@ void ArwDecoder::decodeMetaDataInternal(
+ //Default
+ int iso = 0;
+
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_ColorFilterArray.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/ColorFilterArray.cpp.orig 2017-02-18 19:34:05.552264374 +0000
++++ src/external/rawspeed/RawSpeed/ColorFilterArray.cpp
+@@ -85,13 +85,14 @@ CFAColor ColorFilterArray::getColorAt( u
+ return cfa[x+y*size.x];
+ }
+
+-void ColorFilterArray::setCFA( iPoint2D in_size, ... )
++void ColorFilterArray::setCFA(int sizeA, int sizeB, ... )
+ {
++ iPoint2D in_size(sizeA, sizeB);
+ if (in_size != size) {
+ setSize(in_size);
+ }
+ va_list arguments;
+- va_start(arguments, in_size);
++ va_start(arguments, sizeB);
+ for (uint32 i = 0; i < size.area(); i++ ) {
+ cfa[i] = (CFAColor)va_arg(arguments, int);
+ }
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_ColorFilterArray.h,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+Only POD types can be used with variadic functions.
+
+--- src/external/rawspeed/RawSpeed/ColorFilterArray.h.orig 2017-02-18 19:39:46.465232404 +0000
++++ src/external/rawspeed/RawSpeed/ColorFilterArray.h
+@@ -52,7 +52,7 @@ public:
+ virtual ~ColorFilterArray(void);
+ virtual void setSize(iPoint2D size);
+ void setColorAt(iPoint2D pos, CFAColor c);
+- virtual void setCFA(iPoint2D size, ...);
++ virtual void setCFA(int sizeA, int sizeB, ...);
+ CFAColor* getCfaWrt() {return cfa;};
+ virtual CFAColor getColorAt(uint32 x, uint32 y);
+ virtual uint32 getDcrawFilter();
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_Cr2Decoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/Cr2Decoder.cpp.orig 2017-02-18 19:40:53.670055201 +0000
++++ src/external/rawspeed/RawSpeed/Cr2Decoder.cpp
+@@ -280,7 +280,7 @@ void Cr2Decoder::checkSupportInternal(Ca
+
+ void Cr2Decoder::decodeMetaDataInternal(CameraMetaData *meta) {
+ int iso = 0;
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_CrwDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/CrwDecoder.cpp.orig 2017-02-18 19:40:55.750611715 +0000
++++ src/external/rawspeed/RawSpeed/CrwDecoder.cpp
+@@ -105,7 +105,7 @@ static float canonEv(const long in) {
+
+ void CrwDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
+ int iso = 0;
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
+ vector<CiffIFD*> data = mRootIFD->getIFDsWithTag(CIFF_MAKEMODEL);
+ if (data.empty())
+ ThrowRDE("CRW Support check: Model name not found");
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_NefDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/NefDecoder.cpp.orig 2017-02-18 19:40:57.837514025 +0000
++++ src/external/rawspeed/RawSpeed/NefDecoder.cpp
+@@ -411,7 +411,7 @@ string NefDecoder::getExtendedMode(strin
+
+ void NefDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
+ int iso = 0;
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
+
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_OrfDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/OrfDecoder.cpp.orig 2017-02-18 19:40:59.878456264 +0000
++++ src/external/rawspeed/RawSpeed/OrfDecoder.cpp
+@@ -264,7 +264,7 @@ void OrfDecoder::checkSupportInternal(Ca
+
+ void OrfDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
+ int iso = 0;
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_PefDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/PefDecoder.cpp.orig 2017-02-18 19:41:02.200086539 +0000
++++ src/external/rawspeed/RawSpeed/PefDecoder.cpp
+@@ -95,7 +95,7 @@ void PefDecoder::checkSupportInternal(Ca
+
+ void PefDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
+ int iso = 0;
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN2, CFA_BLUE);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_Rw2Decoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/Rw2Decoder.cpp.orig 2017-02-18 19:41:04.240843715 +0000
++++ src/external/rawspeed/RawSpeed/Rw2Decoder.cpp
+@@ -211,7 +211,7 @@ void Rw2Decoder::checkSupportInternal(Ca
+ }
+
+ void Rw2Decoder::decodeMetaDataInternal(CameraMetaData *meta) {
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_BLUE, CFA_GREEN, CFA_GREEN2, CFA_RED);
++ mRaw->cfa.setCFA(2, 2, CFA_BLUE, CFA_GREEN, CFA_GREEN2, CFA_RED);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
diff -r 0b2393680fdc -r fb709db500ca graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/darktable/patches/patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp Sat Feb 18 23:17:02 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_external_rawspeed_RawSpeed_ThreefrDecoder.cpp,v 1.1 2017/02/18 23:17:02 joerg Exp $
+
+--- src/external/rawspeed/RawSpeed/ThreefrDecoder.cpp.orig 2017-02-18 19:41:06.261836198 +0000
++++ src/external/rawspeed/RawSpeed/ThreefrDecoder.cpp
+@@ -77,7 +77,7 @@ void ThreefrDecoder::checkSupportInterna
+ }
+
+ void ThreefrDecoder::decodeMetaDataInternal(CameraMetaData *meta) {
+- mRaw->cfa.setCFA(iPoint2D(2,2), CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE);
++ mRaw->cfa.setCFA(2, 2, CFA_RED, CFA_GREEN, CFA_GREEN, CFA_BLUE);
+ vector<TiffIFD*> data = mRootIFD->getIFDsWithTag(MODEL);
+
+ if (data.empty())
Home |
Main Index |
Thread Index |
Old Index