r16593@tres: ted | 2007-09-18 09:16:31 -0700

 Commenting out convolve completely and removing flop.

(bzr r3768)

5 files changed, 3 insertions, 87 deletions

diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 284c45e6b..2ff91cc94 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -70,14 +70,12 @@
 #include "internal/bitmap/charcoal.h"
 #include "internal/bitmap/colorize.h"
 #include "internal/bitmap/contrast.h"
-//#include "internal/bitmap/convolve.h"
 #include "internal/bitmap/cycleColormap.h"
 #include "internal/bitmap/despeckle.h"
 #include "internal/bitmap/edge.h"
 #include "internal/bitmap/emboss.h"
 #include "internal/bitmap/enhance.h"
 #include "internal/bitmap/equalize.h"
-#include "internal/bitmap/flop.h"
 #include "internal/bitmap/gaussianBlur.h"
 #include "internal/bitmap/implode.h"
 #include "internal/bitmap/level.h"
@@ -204,14 +202,12 @@ init()
     Internal::Bitmap::Charcoal::init();
     Internal::Bitmap::Colorize::init();
     Internal::Bitmap::Contrast::init();
-    //Internal::Bitmap::Convolve::init();
     Internal::Bitmap::CycleColormap::init();
     Internal::Bitmap::Edge::init();
     Internal::Bitmap::Despeckle::init();
     Internal::Bitmap::Emboss::init();
     Internal::Bitmap::Enhance::init();
     Internal::Bitmap::Equalize::init();
-    Internal::Bitmap::Flop::init();
     Internal::Bitmap::GaussianBlur::init();
     Internal::Bitmap::Implode::init();
     Internal::Bitmap::Level::init();
diff --git a/src/extension/internal/Makefile_insert b/src/extension/internal/Makefile_insert
index 418498efd..d759b5536 100644
--- a/src/extension/internal/Makefile_insert
+++ b/src/extension/internal/Makefile_insert
@@ -29,8 +29,6 @@ extension_internal_image_magick_sources =	\
 	extension/internal/bitmap/colorize.h			\
 	extension/internal/bitmap/contrast.cpp			\
 	extension/internal/bitmap/contrast.h			\
-	extension/internal/bitmap/convolve.cpp			\
-	extension/internal/bitmap/convolve.h			\
 	extension/internal/bitmap/cycleColormap.cpp		\
 	extension/internal/bitmap/cycleColormap.h		\
 	extension/internal/bitmap/despeckle.cpp			\
@@ -43,8 +41,6 @@ extension_internal_image_magick_sources =	\
 	extension/internal/bitmap/enhance.h				\
 	extension/internal/bitmap/equalize.cpp			\
 	extension/internal/bitmap/equalize.h			\
-	extension/internal/bitmap/flop.cpp				\
-	extension/internal/bitmap/flop.h				\
 	extension/internal/bitmap/gaussianBlur.cpp		\
 	extension/internal/bitmap/gaussianBlur.h		\
 	extension/internal/bitmap/implode.cpp			\
diff --git a/src/extension/internal/bitmap/flop.cpp b/src/extension/internal/bitmap/flop.cpp
deleted file mode 100644
index ef5d41d49..000000000
--- a/src/extension/internal/bitmap/flop.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2007 Authors:
- *   Christopher Brown <audiere@gmail.com>
- *   Ted Gould <ted@gould.cx>
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include "extension/effect.h"
-#include "extension/system.h"
-
-#include "flop.h"
-
-namespace Inkscape {
-namespace Extension {
-namespace Internal {
-namespace Bitmap {
-	
-void
-Flop::applyEffect(Magick::Image *image) {
-	image->flop();
-}
-
-void
-Flop::refreshParameters(Inkscape::Extension::Effect *module) { }
-
-#include "../clear-n_.h"
-
-void
-Flop::init(void)
-{
-	Inkscape::Extension::build_from_mem(
-		"<inkscape-extension>\n"
-			"<name>" N_("Flop") "</name>\n"
-			"<id>org.inkscape.effect.bitmap.flop</id>\n"
-			"<effect>\n"
-				"<object-type>all</object-type>\n"
-				"<effects-menu>\n"
-					"<submenu name=\"" N_("Raster") "\" />\n"
-				"</effects-menu>\n"
-				"<menu-tip>" N_("Flop selected bitmap(s) -- reflect each scanline in the horizontal direction.") "</menu-tip>\n"
-			"</effect>\n"
-		"</inkscape-extension>\n", new Flop());
-}
-
-}; /* namespace Bitmap */
-}; /* namespace Internal */
-}; /* namespace Extension */
-}; /* namespace Inkscape */
diff --git a/src/extension/internal/bitmap/flop.h b/src/extension/internal/bitmap/flop.h
deleted file mode 100644
index d996396ea..000000000
--- a/src/extension/internal/bitmap/flop.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2007 Authors:
- *   Christopher Brown <audiere@gmail.com>
- *   Ted Gould <ted@gould.cx>
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include "imagemagick.h"
-
-namespace Inkscape {
-namespace Extension {
-namespace Internal {
-namespace Bitmap {
-
-class Flop : public ImageMagick
-{
-public:
-    void applyEffect(Magick::Image *image);
-	void refreshParameters(Inkscape::Extension::Effect *module);
-    static void init (void);
-};
-
-}; /* namespace Bitmap */
-}; /* namespace Internal */
-}; /* namespace Extension */
-}; /* namespace Inkscape */
diff --git a/src/extension/internal/gnome.cpp b/src/extension/internal/gnome.cpp
index 4bdec5f98..0ea658f68 100644
--- a/src/extension/internal/gnome.cpp
+++ b/src/extension/internal/gnome.cpp
@@ -212,7 +212,7 @@ PrintGNOME::fill(Inkscape::Extension::Print *mod,
     t[4] = ctm->c[4];
     t[5] = ctm->c[5];
 
-    if (style->fill.type == SP_PAINT_TYPE_COLOR) {
+    if (true) {
 	float rgb[3], opacity;
 	sp_color_get_rgb_floatv (&style->fill.value.color, rgb);
 	gnome_print_setrgbcolor (_gpc, rgb[0], rgb[1], rgb[2]);
@@ -230,7 +230,7 @@ PrintGNOME::fill(Inkscape::Extension::Print *mod,
 	} else {
 	    gnome_print_fill (_gpc);
 	}
-    } else if (style->fill.type == SP_PAINT_TYPE_PAINTSERVER) {
+    } else if (true) {
 	SPPainter *painter;
 	NRRect dpbox;
 
@@ -315,7 +315,7 @@ PrintGNOME::stroke (Inkscape::Extension::Print *mod, const NRBPath *bpath, const
     t[4] = ctm->c[4];
     t[5] = ctm->c[5];
 
-    if (style->stroke.type == SP_PAINT_TYPE_COLOR) {
+    if (true) {
 	float rgb[3], opacity;
 	sp_color_get_rgb_floatv (&style->stroke.value.color, rgb);
 	gnome_print_setrgbcolor (_gpc, rgb[0], rgb[1], rgb[2]);