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

List:       kde-commits
Subject:    koffice/filters/krita
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2008-03-10 23:48:15
Message-ID: 1205192895.437128.18482.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784348 by langkamp:

reenabled graphicsmagick filter

 M  +1 -1      CMakeLists.txt  
 M  +1 -1      gmagick/kis_image_magick_converter.cc  
 M  +2 -0      gmagick/magickexport.cpp  


--- trunk/koffice/filters/krita/CMakeLists.txt #784347:784348
@@ -53,7 +53,7 @@
 endif(OPENEXR_FOUND)
 
 if(GRAPHICSMAGICK_FOUND)
-#    add_subdirectory(gmagick)
+    add_subdirectory(gmagick)
 endif(GRAPHICSMAGICK_FOUND)
 
 if(POPPLER_FOUND AND HAVE_POPPLER_0_6)
--- trunk/koffice/filters/krita/gmagick/kis_image_magick_converter.cc #784347:784348
@@ -416,7 +416,7 @@
     m_img = 0;
 
     while ((image = RemoveFirstImageFromList(&images))) {
-        if(image->rows == 0 or image->columns == 0) return KisImageBuilder_RESULT_FAILURE;
+        if(image->rows == 0 || image->columns == 0) return KisImageBuilder_RESULT_FAILURE;
         ViewInfo *vi = OpenCacheView(image);
 
         // Determine image depth -- for now, all channels of an imported image are of the same depth
--- trunk/koffice/filters/krita/gmagick/magickexport.cpp #784347:784348
@@ -20,8 +20,10 @@
 #include <kgenericfactory.h>
 #include <KoDocument.h>
 #include <KoFilterChain.h>
+#include <KoColorSpace.h>
 
 #include <kis_doc2.h>
+#include <kis_paint_device.h>
 #include <kis_paint_layer.h>
 #include <kis_image.h>
 #include <kis_annotation.h>
[prev in list] [next in list] [prev in thread] [next in thread]