[gdcm] Update charls patch for JlsParameter usage

Orion Poplawski orion at fedoraproject.org
Wed Nov 2 14:59:49 UTC 2011


commit c2ef21609e20058878d8b86819375cb797d09fc2
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Nov 2 08:59:47 2011 -0600

    Update charls patch for JlsParameter usage

 gdcm-2.0.18-charls.patch |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/gdcm-2.0.18-charls.patch b/gdcm-2.0.18-charls.patch
index 03e5166..61de90e 100644
--- a/gdcm-2.0.18-charls.patch
+++ b/gdcm-2.0.18-charls.patch
@@ -1,6 +1,6 @@
 diff -up gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx
 --- gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls	2011-06-29 01:08:45.000000000 -0600
-+++ gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx	2011-11-02 08:42:35.461761850 -0600
++++ gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx	2011-11-02 08:59:23.582956059 -0600
 @@ -17,8 +17,7 @@
  
  #include <fstream>
@@ -11,3 +11,27 @@ diff -up gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls gdcm-2.0.18/Example
  
  /*
   * This small example should show how one can handle the famous JAI-JPEGLS bug
+@@ -67,7 +66,11 @@ int main(int argc, char *argv[])
+   char *buffer = &vbuffer[0];
+     sf->GetBuffer(buffer, totalLen);
+ 
++#ifdef GDCM_USE_SYSTEM_CHARLS
++  JlsParameters metadata;
++#else
+   JlsParamaters metadata;
++#endif
+   if (JpegLsReadHeader(buffer, totalLen, &metadata) != OK)
+     {
+     std::cerr << "Cant parse jpegls" << std::endl;
+@@ -156,7 +159,11 @@ int main(int argc, char *argv[])
+   const char *pbyteCompressed = &vbuffer[0];
+   unsigned int cbyteCompressed = vbuffer.size(); // updated legnth
+ 
++#ifdef GDCM_USE_SYSTEM_CHARLS
++  JlsParameters params = {0};
++#else
+   JlsParamaters params = {0};
++#endif
+   JpegLsReadHeader(pbyteCompressed, cbyteCompressed, &params);
+ 
+   std::vector<BYTE> rgbyteOut;


More information about the scm-commits mailing list