[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/krita
From:       Cyrille Berger <cyb () lepi ! org>
Date:       2008-10-27 19:05:12
Message-ID: 1225134312.081888.31274.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 876645 by berger:

should fix compilation with GM 1.2


 M  +11 -11    CMakeLists.txt  
 M  +27 -7     gmagick/kis_image_magick_converter.cc  


--- trunk/koffice/filters/krita/CMakeLists.txt #876644:876645
@@ -20,23 +20,23 @@
 endif(EXIV2_FOUND)
 
 macro_optional_find_package(GraphicsMagick)
-if(GRAPHICSMAGICK_FOUND)
-   if(GRAPHICSMAGICK_MAJOR_VERSION GREATER 1 OR GRAPHICSMAGICK_MINOR_VERSION GREATER \
                1)
-      message(STATUS "GraphicsMagick version ${GRAPHICSMAGICK_VERSION} too recent.  \
                Only 1.1 series supported.")
-      set(GRAPHICSMAGICK_FOUND FALSE)
-   endif(GRAPHICSMAGICK_MAJOR_VERSION GREATER 1 OR GRAPHICSMAGICK_MINOR_VERSION \
                GREATER 1)
-   if(GRAPHICSMAGICK_MAJOR_VERSION LESS 1 OR GRAPHICSMAGICK_MINOR_VERSION LESS 1)
-      message(STATUS "GraphicsMagick version ${GRAPHICSMAGICK_VERSION} too old.  \
                Only 1.1 series supported.")
-      set(GRAPHICSMAGICK_FOUND FALSE)
-   endif(GRAPHICSMAGICK_MAJOR_VERSION LESS 1 OR GRAPHICSMAGICK_MINOR_VERSION LESS 1)
-endif(GRAPHICSMAGICK_FOUND)
+# if(GRAPHICSMAGICK_FOUND)
+#    if(GRAPHICSMAGICK_MAJOR_VERSION GREATER 1 OR GRAPHICSMAGICK_MINOR_VERSION \
GREATER 1) +#       message(STATUS "GraphicsMagick version ${GRAPHICSMAGICK_VERSION} \
too recent.  Only 1.1 series supported.") +#       set(GRAPHICSMAGICK_FOUND FALSE)
+#    endif(GRAPHICSMAGICK_MAJOR_VERSION GREATER 1 OR GRAPHICSMAGICK_MINOR_VERSION \
GREATER 1) +#    if(GRAPHICSMAGICK_MAJOR_VERSION LESS 1 OR \
GRAPHICSMAGICK_MINOR_VERSION LESS 1) +#       message(STATUS "GraphicsMagick version \
${GRAPHICSMAGICK_VERSION} too old.  Only 1.1 series supported.") +#       \
set(GRAPHICSMAGICK_FOUND FALSE) +#    endif(GRAPHICSMAGICK_MAJOR_VERSION LESS 1 OR \
GRAPHICSMAGICK_MINOR_VERSION LESS 1) +# endif(GRAPHICSMAGICK_FOUND)
 
 macro_log_feature(JPEG_FOUND "jpeg" "The Krita JPEG filter will not be built" \
"http://www.ijg.org" FALSE "")  macro_log_feature(EXIV2_FOUND "Exiv2" "The Krita JPEG \
and PNG filters will not be built" "http://www.exiv2.org" FALSE "0.16")  \
macro_log_feature(TIFF_FOUND "tiff" "The Krita TIFF filter will not be built" \
"http://www.remotesensing.org/libtiff" FALSE "")  macro_log_feature(PNG_FOUND "png" \
"The Krita PNG filter will not be built" "http://www.libpng.org/pub/png/libpng.html" \
FALSE "")  macro_log_feature(OPENEXR_FOUND "OpenEXR" "The Krita OpenEXR filter will \
                not be built" "http://www.openexr.com" FALSE "")
-macro_log_feature(GRAPHICSMAGICK_FOUND "GraphicsMagick" "The Krita GraphicsMagick \
filter for various file formats (including PSD, XCF) will not be built" \
"http://www.graphicsmagick.org" FALSE "1.1" "GraphicsMagick 1.2 or later is not \
supported") +macro_log_feature(GRAPHICSMAGICK_FOUND "GraphicsMagick" "The Krita \
GraphicsMagick filter for various file formats (including PSD, XCF) will not be \
built" "http://www.graphicsmagick.org" FALSE "1.1" )  macro_log_feature( \
POPPLER_FOUND "poppler-qt4" "The Krita PDF filter will not be built (version 0.6.x is \
currently required)" "http://poppler.freedesktop.org" FALSE "")  
 include_directories(${KRITA_INCLUDES})
--- trunk/koffice/filters/krita/gmagick/kis_image_magick_converter.cc #876644:876645
@@ -177,19 +177,39 @@
         KisAnnotation* annotation = new KisAnnotation(QString("IPTC"), "", rawdata);
         Q_CHECK_PTR(annotation);
 
-        image -> addAnnotation(annotation);
-    }
-    for (int i = 0; i < src->generic_profiles; i++) {
-        QByteArray rawdata;
-        rawdata.resize(length);
-        memcpy(rawdata.data(), src->generic_profile[i].info, \
src->generic_profile[i].length); +            image -> addAnnotation(annotation);
+        }
+#if MagickLibVersion >= 0x0200000
+        {
+          ImageProfileIterator profile_iterator = AllocateImageProfileIterator( 
+          const char * name;
+          const unsigned char * profile;
+          size_t length;
+          while( NextImageProfile( profile_iterator, &name, &profile, &length ) != \
MagickPassFail ) +          {
+              QByteArray rawdata;
+              rawdata.resize(length);
+              memcpy(rawdata.data(), profile, length);
+  
+              KisAnnotation* annotation = new KisAnnotation(QString(name), "", \
rawdata); +              Q_CHECK_PTR(annotation);
+  
+              image -> addAnnotation(annotation);
+          }
+        }
+#else
+        for(int i = 0; i < src->generic_profiles; i++)
+        {
+            QByteArray rawdata;
+            rawdata.resize(src->generic_profile[i].length);
+            memcpy(rawdata.data(), src->generic_profile[i].info, \
src->generic_profile[i].length);  
         KisAnnotation* annotation = new \
KisAnnotation(QString(src->generic_profile[i].name), "", rawdata);  \
Q_CHECK_PTR(annotation);  
         image -> addAnnotation(annotation);
     }
-
+#endif
     const ImageAttribute* imgAttr = GetImageAttribute(src, NULL);
     while (imgAttr) {
         QByteArray rawdata;


[prev in list] [next in list] [prev in thread] [next in thread]