From 61b99a2b9bd66a85716e58ac6abd57a2c69b022b Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sep 26 2012 21:10:14 +0000 Subject: remove unused patches --- diff --git a/apvlv-poppler015.patch b/apvlv-poppler015.patch deleted file mode 100644 index bb960df..0000000 --- a/apvlv-poppler015.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up ./src/ApvlvFile.cpp.old ./src/ApvlvFile.cpp ---- ./src/ApvlvFile.cpp.old 2011-08-02 03:11:15.000000000 +0400 -+++ ./src/ApvlvFile.cpp 2011-08-02 03:12:18.000000000 +0400 -@@ -273,9 +273,15 @@ ApvlvPDF::ApvlvPDF (const char *filename - - bool ApvlvPDF::pagetext (int pn, int x1, int y1, int x2, int y2, char **out) - { -- PopplerRectangle rect = { x1, y1, x2, y2 }; - PopplerPage *page = poppler_document_get_page (mDoc, pn); -+#if POPPLER_CHECK_VERSION(0, 15, 1) -+ PopplerRectangle rect = { x1, y2, x2, y1 }; -+ *out = poppler_page_get_selected_text (page, POPPLER_SELECTION_WORD, &rect); -+#else -+ PopplerRectangle rect = { x1, y1, x2, y2 }; - *out = poppler_page_get_text (page, POPPLER_SELECTION_WORD, &rect); -+#endif -+ - if (*out != NULL) - { - return true; diff --git a/apvlv-poppler017.patch b/apvlv-poppler017.patch deleted file mode 100644 index 7f8b69b..0000000 --- a/apvlv-poppler017.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -up ./src/ApvlvFile.cpp.old ./src/ApvlvFile.cpp ---- ./src/ApvlvFile.cpp.old 2011-08-02 03:14:08.000000000 +0400 -+++ ./src/ApvlvFile.cpp 2011-08-02 03:16:32.000000000 +0400 -@@ -28,6 +28,7 @@ - #include "ApvlvFile.hpp" - #include "ApvlvUtil.hpp" - #include "ApvlvView.hpp" -+#include "poppler_page_render_to_pixbuf.c" - - #include - #include - -diff -up /dev/null ./src/poppler_page_render_to_pixbuf.c ---- ./src/poppler_page_render_to_pixbuf.c.new 2011-08-02 00:58:46.000000000 +0400 -+++ ./src/poppler_page_render_to_pixbuf.c 2011-08-02 03:28:02.000000000 +0400 -@@ -0,0 +1,136 @@ -+#if POPPLER_CHECK_VERSION(0, 17, 0) -+typedef bool GBool; -+#define gTrue true -+#define gFalse false -+ -+static void -+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, -+ GdkPixbuf *pixbuf) -+{ -+ int cairo_width, cairo_height, cairo_rowstride; -+ unsigned char *pixbuf_data, *dst, *cairo_data; -+ int pixbuf_rowstride, pixbuf_n_channels; -+ unsigned int *src; -+ int x, y; -+ -+ cairo_width = cairo_image_surface_get_width (surface); -+ cairo_height = cairo_image_surface_get_height (surface); -+ cairo_rowstride = cairo_image_surface_get_stride (surface); -+ cairo_data = cairo_image_surface_get_data (surface); -+ -+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); -+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); -+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); -+ -+ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) -+ cairo_width = gdk_pixbuf_get_width (pixbuf); -+ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) -+ cairo_height = gdk_pixbuf_get_height (pixbuf); -+ for (y = 0; y < cairo_height; y++) -+ { -+ src = (unsigned int *) (cairo_data + y * cairo_rowstride); -+ dst = pixbuf_data + y * pixbuf_rowstride; -+ for (x = 0; x < cairo_width; x++) -+ { -+ dst[0] = (*src >> 16) & 0xff; -+ dst[1] = (*src >> 8) & 0xff; -+ dst[2] = (*src >> 0) & 0xff; -+ if (pixbuf_n_channels == 4) -+ dst[3] = (*src >> 24) & 0xff; -+ dst += pixbuf_n_channels; -+ src++; -+ } -+ } -+} -+ -+static void -+_poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GBool printing, -+ GdkPixbuf *pixbuf) -+{ -+ cairo_t *cr; -+ cairo_surface_t *surface; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, -+ src_width, src_height); -+ cr = cairo_create (surface); -+ cairo_save (cr); -+ switch (rotation) { -+ case 90: -+ cairo_translate (cr, src_x + src_width, -src_y); -+ break; -+ case 180: -+ cairo_translate (cr, src_x + src_width, src_y + src_height); -+ break; -+ case 270: -+ cairo_translate (cr, -src_x, src_y + src_height); -+ break; -+ default: -+ cairo_translate (cr, -src_x, -src_y); -+ } -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ if (rotation != 0) -+ cairo_rotate (cr, rotation * G_PI / 180.0); -+ -+ if (printing) -+ poppler_page_render_for_printing (page, cr); -+ else -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1., 1., 1.); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ copy_cairo_surface_to_pixbuf (surface, pixbuf); -+ cairo_surface_destroy (surface); -+} -+ -+/** -+ * poppler_page_render_to_pixbuf: -+ * @page: the page to render from -+ * @src_x: x coordinate of upper left corner -+ * @src_y: y coordinate of upper left corner -+ * @src_width: width of rectangle to render -+ * @src_height: height of rectangle to render -+ * @scale: scale specified as pixels per point -+ * @rotation: rotate the document by the specified degree -+ * @pixbuf: pixbuf to render into -+ * -+ * First scale the document to match the specified pixels per point, -+ * then render the rectangle given by the upper left corner at -+ * (src_x, src_y) and src_width and src_height. -+ * This function is for rendering a page that will be displayed. -+ * If you want to render a page that will be printed use -+ * poppler_page_render_to_pixbuf_for_printing() instead -+ * -+ * Deprecated: 0.16 -+ **/ -+void -+poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GdkPixbuf *pixbuf) -+{ -+ g_return_if_fail (POPPLER_IS_PAGE (page)); -+ g_return_if_fail (scale > 0.0); -+ g_return_if_fail (pixbuf != NULL); -+ -+ _poppler_page_render_to_pixbuf (page, src_x, src_y, -+ src_width, src_height, -+ scale, rotation, -+ gFalse, -+ pixbuf); -+} -+#endif