rpms/openoffice.org/devel openoffice.org-2.0.3.oooXXXXX.agg24.canvas.patch, NONE, 1.1 openoffice.org.spec, 1.700, 1.701

Thu May 11 12:52:07 UTC 2006

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10076

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.oooXXXXX.agg24.canvas.patch 
Log Message:
update for agg2

openoffice.org-2.0.3.oooXXXXX.agg24.canvas.patch:
 canvas/source/tools/image.cxx |   55 ++++++++++++++++++++++--------------------
 source/tools/image.cxx        |    0 
 2 files changed, 29 insertions(+), 26 deletions(-)

--- NEW FILE openoffice.org-2.0.3.oooXXXXX.agg24.canvas.patch ---
Index: source/tools/image.cxx
===================================================================
RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
retrieving revision 1.4
diff -u -r1.4 image.cxx
--- openoffice.org.orig/canvas/source/tools/image.cxx	14 Dec 2005 11:16:19 -0000	1.4
+++ openoffice.org/canvas/source/tools/image.cxx	11 May 2006 12:49:26 -0000
@@ -76,15 +76,14 @@
 #include <agg2/agg_renderer_outline_aa.h>
 #include <agg2/agg_renderer_primitives.h>
 #include <agg2/agg_path_storage.h>
-#include <agg2/agg_span_pattern.h>
 #include <agg2/agg_span_pattern_rgba.h>
-#include <agg2/agg_span_pattern_resample_rgb.h>
-#include <agg2/agg_span_pattern_resample_rgba.h>
+#include <agg2/agg_span_image_filter_rgb.h>
+#include <agg2/agg_span_image_filter_rgba.h>
 #include <agg2/agg_span_interpolator_linear.h>
 #include <agg2/agg_span_gradient.h>
-#include <agg2/agg_span_image_resample_rgb.h>
-#include <agg2/agg_span_image_resample_rgba.h>
+#include <agg2/agg_span_allocator.h>
 #include <agg2/agg_image_filters.h>
+#include <agg2/agg_image_accessors.h>
 #include <agg2/agg_dda_line.h>
 #include <agg2/agg_scanline_storage_aa.h>
 #include <agg2/agg_scanline_storage_bin.h>
@@ -1145,7 +1144,7 @@
 // cachedPrimitiveFTPP [cachedPrimitive for [F]ill[T]extured[P]oly[P]olygon]
 //////////////////////////////////////////////////////////////////////////////////
 
-template<class pixel_format,class span_gen_type>
+template<class pixel_format_dst,class span_gen_type>
 class cachedPrimitiveFTPP : public ImageCachedPrimitive
 {
 	public:
@@ -1157,10 +1156,12 @@
 			aTransform(rTransform),
 			inter(tm),
 			filter(filter_kernel),
-			sg(sa,src,inter,filter),
-			pixf(dst),
-			rb(pixf),
-			ren(rb,sg)
+			pixs(const_cast<agg::rendering_buffer&>(src)),
+			source(pixs),
+			sg(source,inter,filter),
+			pixd(dst),
+			rb(pixd),
+			ren(rb,sa,sg)
 		{
 			::basegfx::B2DHomMatrix aFinalTransform(aTransform);
 			aFinalTransform *= rViewTransform;
@@ -1192,16 +1193,21 @@
 	private:
 
 		typedef agg::span_interpolator_linear<> interpolator_type;
-		typedef agg::renderer_base<pixel_format> renderer_base;
-		typedef agg::renderer_scanline_aa<renderer_base, span_gen_type> renderer_type;
+		typedef agg::renderer_base<pixel_format_dst> renderer_base;
+		typedef agg::span_allocator< typename span_gen_type::color_type > span_alloc_type;
+		typedef agg::renderer_scanline_aa<renderer_base, span_alloc_type, span_gen_type> renderer_type;
+		typedef typename span_gen_type::source_type source_type;
+		typedef typename span_gen_type::source_type::pixfmt_type pixel_format_src;
 
 		::basegfx::B2DHomMatrix aTransform;
 		interpolator_type inter;
 		agg::image_filter_bilinear filter_kernel;
 		agg::image_filter_lut filter;
-		agg::span_allocator< typename span_gen_type::color_type > sa;
+		span_alloc_type sa;
+		pixel_format_src pixs;
+        	source_type source;
 		span_gen_type sg;
-		pixel_format pixf;
+		pixel_format_dst pixd;
 		renderer_base rb;
 		mutable renderer_type ren;
 		mutable agg::scanline_p8 sl;
@@ -1414,14 +1420,12 @@
 	typedef agg::wrap_mode_repeat wrap_y_type;
 	typedef agg::pixfmt_rgb24 pixfmt_rgb24;
 	typedef agg::pixfmt_rgba32 pixfmt_rgba32;
-	typedef agg::span_pattern_resample_rgba_affine<	pixfmt_rgba32::color_type, 
-													pixfmt_rgba32::order_type,
-													wrap_x_type,
-													wrap_y_type> span_gen_type_rgba;
-	typedef agg::span_pattern_resample_rgb_affine< pixfmt_rgb24::color_type, 
-													pixfmt_rgb24::order_type, 
-													wrap_x_type,
-													wrap_y_type> span_gen_type_rgb;
+
+	typedef agg::image_accessor_wrap< pixfmt_rgba32, wrap_x_type, wrap_y_type > img_source_type_rgba;
+	typedef agg::image_accessor_wrap< pixfmt_rgb24, wrap_x_type, wrap_y_type > img_source_type_rgb;
+
+	typedef agg::span_image_resample_rgba_affine< img_source_type_rgba > span_gen_type_rgba;
+	typedef agg::span_image_resample_rgb_affine< img_source_type_rgb > span_gen_type_rgb;
 
 	const Format nDest = maDesc.eFormat;
 	const Format nSource = rTexture.maDesc.eFormat;
@@ -1572,8 +1576,7 @@
 							interpolator_type,
 							gradient_polymorphic_wrapper_base,
 							color_generator_type > gradient_span_gen;
-	gradient_span_gen span_gen(span_alloc,
-                               inter,
+	gradient_span_gen span_gen(inter,
                                *gf[rValues.meType],
                                colors,
                                0,
@@ -1593,8 +1596,8 @@
 	// [in contrast to solid renderers, that is]
 	// the instance of this particular renderer combines the
 	// renderbuffer [i.e. destination] and the spanline generator [i.e. source]
-	typedef agg::renderer_scanline_aa<renderer_base, gradient_span_gen> renderer_gradient;
-	renderer_gradient r1(rb, span_gen);
+	typedef agg::renderer_scanline_aa<renderer_base, gradient_span_alloc, gradient_span_gen> renderer_gradient;
+	renderer_gradient r1(rb, span_alloc, span_gen);
 
 	// instantiate the rasterizer and feed the incoming polypolygon.
 	agg::rasterizer_scanline_aa<> ras;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.700
retrieving revision 1.701
diff -u -r1.700 -r1.701
--- openoffice.org.spec	11 May 2006 07:28:22 -0000	1.700
+++ openoffice.org.spec	11 May 2006 12:52:04 -0000	1.701
@@ -220,6 +220,7 @@
 Patch31: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
 Patch32: openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch
 Patch33: openoffice.org-2.0.3.ooo65230.x86_64.automation.patch
+Patch34: openoffice.org-2.0.3.oooXXXXX.agg24.canvas.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1135,6 +1136,7 @@
 %patch31 -p1 -b .ooo65052.bridges.makeasmpic.patch
 %patch32 -p1 -b .oooXXXXX.exceptions.sd.patch
 %patch33 -p1 -b .ooo65230.x86_64.automation.patch
+%patch34 -p1 -b .oooXXXXX.agg24.canvas.patch
 
 %if %{includingexternals}
 #start ludicrous workaround


