API tools faq
paste
Guest User

epson-inkjet-printer-filter 1.0.0 vs 1.0.2

a guest
Jan 17th, 2025
49
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.28 KB | Software | 0 0
raw download clone embed print report
  1. diff -aur epson-inkjet-printer-filter-1.0.0/configure.ac epson-inkjet-printer-filter-1.0.2/configure.ac
  2. --- epson-inkjet-printer-filter-1.0.0/configure.ac  2010-01-09 02:21:05.000000000 +0100
  3. +++ epson-inkjet-printer-filter-1.0.2/configure.ac  2024-02-06 11:50:44.000000000 +0100
  4. @@ -2,7 +2,7 @@
  5.  # Process this file with autoconf to produce a configure script.
  6.  
  7.  AC_PREREQ(2.61)
  8. -AC_INIT(epson-inkjet-printer-filter, 1.0.0, epson@localdomain)
  9. +AC_INIT(epson-inkjet-printer-filter, 1.0.2, epson@localdomain)
  10.  AM_INIT_AUTOMAKE
  11.  
  12.  AC_CONFIG_SRCDIR([src/raster_to_epson.h])
  13. @@ -40,19 +40,19 @@
  14.     LSB_ARCH=64
  15.  fi
  16.  
  17. -if test "x$CC" = "x/opt/lsb/bin/lsbcc"; then
  18. -   CUPS_SERVER_DIR=${prefix}/cups/lib
  19. -   CUPS_LIBS="/opt/lsb/lib"$LSB_ARCH"/libcups.so /opt/lsb/lib"$LSB_ARCH"/libm.so"
  20. -   CUPS_IMAGE_LIBS="/opt/lsb/lib"$LSB_ARCH"/libcupsimage.so /opt/lsb/lib"$LSB_ARCH"/libcups.so /opt/lsb/lib"$LSB_ARCH"/libjpeg.so"
  21. -   DL_LIBS="/opt/lsb/lib"$LSB_ARCH"/libdl.so"
  22. -   STDCPP_LIBS="/opt/lsb/lib"$LSB_ARCH"/libstdc++.so"
  23. -else
  24. +#if test "x$CC" = "x/opt/lsb/bin/lsbcc"; then
  25. +#  CUPS_SERVER_DIR=${prefix}/cups/lib
  26. +#  CUPS_LIBS="/opt/lsb/lib"$LSB_ARCH"/libcups.so /opt/lsb/lib"$LSB_ARCH"/libm.so"
  27. +#  CUPS_IMAGE_LIBS="/opt/lsb/lib"$LSB_ARCH"/libcupsimage.so /opt/lsb/lib"$LSB_ARCH"/libcups.so /opt/lsb/lib"$LSB_ARCH"/libjpeg.so"
  28. +#  DL_LIBS="/opt/lsb/lib"$LSB_ARCH"/libdl.so"
  29. +#  STDCPP_LIBS="/opt/lsb/lib"$LSB_ARCH"/libstdc++.so"
  30. +#else
  31.     CUPS_SERVER_DIR=${prefix}/lib/cups
  32.     CUPS_LIBS='-lcups -lm'
  33.     CUPS_IMAGE_LIBS='-lcupsimage -lcups -ljpeg -lm'
  34.     DL_LIBS='-ldl'
  35.     STDCPP_LIBS='-lstdc++'
  36. -fi
  37. +#fi
  38.  
  39.  AC_SUBST(CUPS_SERVER_DIR)
  40.  AC_SUBST(CUPS_LIBS)
  41. Only in epson-inkjet-printer-filter-1.0.0/include: epcgapi.h
  42. diff -aur epson-inkjet-printer-filter-1.0.0/include/epcgdef.h epson-inkjet-printer-filter-1.0.2/include/epcgdef.h
  43. --- epson-inkjet-printer-filter-1.0.0/include/epcgdef.h 2010-02-16 06:38:20.000000000 +0100
  44. +++ epson-inkjet-printer-filter-1.0.2/include/epcgdef.h 2023-10-04 09:42:29.000000000 +0200
  45. @@ -65,6 +65,7 @@
  46.     EPS_PAGEATTRIB_PRINTABLEAREA_HEIGHT,
  47.     EPS_PAGEATTRIB_FLIP_VERTICAL,
  48.     EPS_PAGEATTRIB_FLIP_HORIZONTAL,
  49. +   EPS_PAGEATTRIB_RETAIN_SIZE,
  50.  } EPS_PAGEATTRIB;
  51.  
  52.  typedef struct _tagEPS_LOCAL_TIME_ {  
  53. diff -aur epson-inkjet-printer-filter-1.0.0/src/pagemanager/Makefile.am epson-inkjet-printer-filter-1.0.2/src/pagemanager/Makefile.am
  54. --- epson-inkjet-printer-filter-1.0.0/src/pagemanager/Makefile.am   2009-08-07 08:56:28.000000000 +0200
  55. +++ epson-inkjet-printer-filter-1.0.2/src/pagemanager/Makefile.am   2024-02-06 11:50:44.000000000 +0100
  56. @@ -7,8 +7,6 @@
  57.     -I../filteropt \
  58.     -I../raster
  59.  
  60. -AM_CFLAGS = -fsigned-char
  61. -
  62.  noinst_LTLIBRARIES = libpagemanager.la
  63.  
  64.  libpagemanager_la_LIBADD = \
  65. @@ -23,4 +21,5 @@
  66.  noinst_HEADERS = \
  67.     subpage.h \
  68.     subpagemanager.h \
  69. -   pagemanager.h
  70. +   pagemanager.h \
  71. +   ../../include/epcgdef.h
  72. diff -aur epson-inkjet-printer-filter-1.0.0/src/pagemanager/pagemanager.c epson-inkjet-printer-filter-1.0.2/src/pagemanager/pagemanager.c
  73. --- epson-inkjet-printer-filter-1.0.0/src/pagemanager/pagemanager.c 2010-04-21 07:32:37.000000000 +0200
  74. +++ epson-inkjet-printer-filter-1.0.2/src/pagemanager/pagemanager.c 2023-10-04 09:42:29.000000000 +0200
  75. @@ -19,11 +19,14 @@
  76.  #include <config.h>
  77.  #endif
  78.  
  79. +#include <string.h>
  80. +
  81.  #include "epcgdef.h"
  82.  #include "debuglog.h"
  83.  #include "memory.h"
  84.  #include "raster.h"
  85.  #include "pagemanager.h"
  86. +#include "raster-helper.h"
  87.  
  88.  extern int JobCanceled;
  89.  
  90. @@ -153,6 +156,7 @@
  91.             page.watermark.color = filterPrintOption.watermarkColor;
  92.         }
  93.         privateData->pipeline = (EpsRasterPipeline *) raster_helper_create_pipeline(&page, EPS_RASTER_PROCESS_MODE_FETCHING);
  94. +
  95.         if (eps_raster_init(&privateData->raster_h, &rasteropt, privateData->pipeline)) {
  96.             subPageManagerDestroy(pageManager->subPageManager);
  97.             eps_free(pageManager);
  98. diff -aur epson-inkjet-printer-filter-1.0.0/src/raster/blendSource/Makefile.am epson-inkjet-printer-filter-1.0.2/src/raster/blendSource/Makefile.am
  99. --- epson-inkjet-printer-filter-1.0.0/src/raster/blendSource/Makefile.am    2009-08-03 08:20:07.000000000 +0200
  100. +++ epson-inkjet-printer-filter-1.0.2/src/raster/blendSource/Makefile.am    2024-02-06 11:50:44.000000000 +0100
  101. @@ -14,7 +14,7 @@
  102.  
  103.  libblendSource_la_SOURCES = \
  104.     blend-watermark.c blend-watermark-wbf-reader.c \
  105. -   blend-source.c blend-source.h
  106. +   blend-source.c blend-source.h blend-watermark.h
  107.  
  108.  noinst_HEADERS = \
  109.     blend-source.h
  110. diff -aur epson-inkjet-printer-filter-1.0.0/src/raster_to_epson.c epson-inkjet-printer-filter-1.0.2/src/raster_to_epson.c
  111. --- epson-inkjet-printer-filter-1.0.0/src/raster_to_epson.c 2010-04-22 03:17:18.000000000 +0200
  112. +++ epson-inkjet-printer-filter-1.0.2/src/raster_to_epson.c 2023-10-04 09:42:29.000000000 +0200
  113. @@ -38,6 +38,7 @@
  114.  #include "raster_to_epson.h"
  115.  #include "pagemanager.h"
  116.  #include "filter_option.h"
  117. +#include "raster-helper.h"
  118.  
  119.  #ifndef PATH_MAX
  120.  #define PATH_MAX 1024
  121. @@ -358,6 +359,7 @@
  122.     EPS_INT32 printableHeight;
  123.     EPS_INT32 flipVertical;
  124.     EPS_INT32 flipHorizontal;
  125. +   EPS_INT32 retain;
  126.     EPS_BOOL bAbort;
  127.  
  128.     EpsPageInfo page = { 0 };
  129. @@ -406,6 +408,7 @@
  130.         epcgGetPageAttribute (EPS_PAGEATTRIB_PRINTABLEAREA_HEIGHT, &printableHeight);
  131.         epcgGetPageAttribute (EPS_PAGEATTRIB_FLIP_VERTICAL, &flipVertical);
  132.         epcgGetPageAttribute (EPS_PAGEATTRIB_FLIP_HORIZONTAL, &flipHorizontal);
  133. +       epcgGetPageAttribute (EPS_PAGEATTRIB_RETAIN_SIZE, &retain);
  134.  
  135.         page.bytes_per_pixel = pageRegion.bitsPerPixel / 8;
  136.         page.src_print_area_x = pageRegion.width;
  137. @@ -417,6 +420,10 @@
  138.             page.reverse = (flipVertical) ? 1 : 0;
  139.             page.mirror = (flipHorizontal) ? 1 : 0;
  140.             page.scale = ((page.src_print_area_x != page.prt_print_area_x) || (page.src_print_area_y != page.prt_print_area_y)) ? 1 : 0;
  141. +          
  142. +           if (retain == 1){          
  143. +               page.scale = 0;
  144. +           }
  145.         }
  146.  
  147.         do {
  148. @@ -438,14 +445,14 @@
  149.                     break;
  150.                 }
  151.  
  152. -               if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, &nraster)) {
  153. +               if (eps_raster_print(raster_h, image_raw, pageRegion.bytesPerLine, pageRegion.width, (int *)&nraster)) {
  154.                     error  = 1;
  155.                     break;
  156.                 }
  157.             }
  158.  
  159.             // flushing page
  160. -           eps_raster_print(raster_h, NULL, 0, 0, &nraster);
  161. +           eps_raster_print(raster_h, NULL, 0, 0, (int *)&nraster);
  162.  
  163.             bAbort = (error) ? TRUE : FALSE;
  164.             if (epcgEndPage (bAbort)) {
  165.  
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!