mirror of https://github.com/GNOME/gimp.git
Sven Neumann
parent
93b9d086fc
commit
ab6afdc206
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
Sat Jan 29 12:06:51 CET 2000 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/common/curve_bend.c
|
||||
* plug-ins/common/deinterlace.c
|
||||
* plug-ins/common/despeckle.c
|
||||
* plug-ins/common/plasma.c
|
||||
* plug-ins/common/randomize.c
|
||||
* plug-ins/common/sharpen.c
|
||||
* plug-ins/gap/gap_frontends_main.c
|
||||
* plug-ins/gdyntext/gdyntext.c
|
||||
* plug-ins/gfig/gfig.c
|
||||
* plug-ins/print/print-ps.c
|
||||
* plug-ins/print/print.c
|
||||
* plug-ins/sel2path/global.h
|
||||
* plug-ins/sel2path/math.c
|
||||
* plug-ins/sel2path/vector.c: removed warnings
|
||||
|
||||
Fri Jan 28 17:38:36 CET 2000 Marc Lehmann <pcg@goof.com>
|
||||
|
||||
* PLUGIN_MAINTAINERS, PLUGIN_CVS: mark Robert Krawitz with write
|
||||
|
|
|
|||
|
|
@ -688,14 +688,13 @@ run (char *name, /* name of plugin */
|
|||
{
|
||||
char *l_env;
|
||||
BenderDialog *cd;
|
||||
gint l_nreturn_vals;
|
||||
|
||||
GDrawable *l_active_drawable = NULL;
|
||||
gint32 l_image_id = -1;
|
||||
gint32 l_layer_id = -1;
|
||||
gint32 l_layer_mask_id = -1;
|
||||
gint32 l_bent_layer_id = -1;
|
||||
|
||||
GDrawable *l_active_drawable = NULL;
|
||||
gint32 l_image_id = -1;
|
||||
gint32 l_layer_id = -1;
|
||||
gint32 l_layer_mask_id = -1;
|
||||
gint32 l_bent_layer_id = -1;
|
||||
|
||||
/* Get the runmode from the in-parameters */
|
||||
GRunModeType run_mode = param[0].data.d_int32;
|
||||
|
||||
|
|
|
|||
|
|
@ -261,7 +261,6 @@ deinterlace_dialog (void)
|
|||
GtkWidget *frame;
|
||||
gchar **argv;
|
||||
gint argc;
|
||||
gint i;
|
||||
|
||||
/* Set args */
|
||||
argc = 1;
|
||||
|
|
|
|||
|
|
@ -36,318 +36,10 @@
|
|||
* dialog_recursive_callback() - Update the filter type...
|
||||
* dialog_ok_callback() - Start the filter...
|
||||
*
|
||||
*
|
||||
* Revision History:
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.26 2000/01/25 23:05:57 mitch
|
||||
* 2000-01-25 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * app/appenv.h: removed BOUNDS, MINIMUM and MAXIMUM. No need to
|
||||
* include both <glib.h> and <gtk/gtk.h>.
|
||||
*
|
||||
* * app/*
|
||||
* * tools/pdbgen/pdb/text_tool.pdb: s/BOUNDS/CLAMP/,
|
||||
* same for MIN and MAX.
|
||||
*
|
||||
* * app/preferences_dialog.c: the "Check Size" widget was connected
|
||||
* to the transparency_type variable.
|
||||
*
|
||||
* * plug-ins/common/sobel.c: removed definitions of MIN and ROUND.
|
||||
*
|
||||
* * libgimp/gimp.h: #include "gimplimits.h" and "gimpcolorspace.h".
|
||||
*
|
||||
* * plug-ins/*: don't include the two files.
|
||||
*
|
||||
* Revision 1.25 2000/01/15 15:32:28 mitch
|
||||
* 2000-01-15 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * libgimp/gimpwidgets.[ch]: added a float adjustment callback.
|
||||
*
|
||||
* * plug-ins/common/bumpmap.c
|
||||
* * plug-ins/common/depthmerge.c
|
||||
* * plug-ins/common/despeckle.c
|
||||
* * plug-ins/common/destripe.c
|
||||
* * plug-ins/common/gpb.c
|
||||
* * plug-ins/common/iwarp.c
|
||||
* * plug-ins/common/polar.c
|
||||
* * plug-ins/common/sharpen.c
|
||||
* * plug-ins/common/tileit.c
|
||||
* * plug-ins/common/whirlpinch.c
|
||||
* * plug-ins/common/wind.c:
|
||||
*
|
||||
* - Some more hscale+spinbutton instead of hscale+entry widgets.
|
||||
* - Get the CHECK_SIZE constants from libgimp in some plugins.
|
||||
*
|
||||
* Revision 1.24 2000/01/14 12:40:59 mitch
|
||||
* 2000-01-14 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * app/Makefile.am
|
||||
* * app/tool_options_ui.h: removed.
|
||||
*
|
||||
* * app/tool_options.c
|
||||
* * libgimp/gimpwidgets.[ch]: moved some more ui utility functions
|
||||
* to libgimp.
|
||||
*
|
||||
* * app/airbrush.c
|
||||
* * app/blend.c
|
||||
* * app/bucket_fill.c
|
||||
* * app/channel_ops.c
|
||||
* * app/clone.c
|
||||
* * app/color_picker.c
|
||||
* * app/convolve.c
|
||||
* * app/crop.c
|
||||
* * app/dodgeburn.c
|
||||
* * app/eraser.c
|
||||
* * app/file_new_dialog.[ch]
|
||||
* * app/flip_tool.c
|
||||
* * app/image_new.[ch]
|
||||
* * app/ink.c
|
||||
* * app/layers_dialog.c
|
||||
* * app/magnify.c
|
||||
* * app/measure.c
|
||||
* * app/paintbrush.c
|
||||
* * app/pencil.c
|
||||
* * app/smudge.c
|
||||
* * app/text_tool.c
|
||||
* * app/tool_options.c
|
||||
* * app/transform_tool.c
|
||||
* * app/xinput_airbrush.c: use the libgimp functions (esp. the radio
|
||||
* button group constructor), some code cleanup.
|
||||
*
|
||||
* * plug-ins/common/csource.c
|
||||
* * plug-ins/common/despeckle.c
|
||||
* * plug-ins/common/diffraction.c
|
||||
* * plug-ins/common/jpeg.c
|
||||
* * plug-ins/common/png.c
|
||||
* * plug-ins/unsharp/unsharp.c: more plugin ui tuning.
|
||||
*
|
||||
* * plug-ins/unsharp/Makefile.am
|
||||
* * plug-ins/unsharp/dialog_f.[ch]
|
||||
* * plug-ins/unsharp/dialog_i.[ch]: removed.
|
||||
*
|
||||
* Revision 1.23 2000/01/13 15:39:24 mitch
|
||||
* 2000-01-13 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * app/gimpui.[ch]
|
||||
* * app/preferences_dialog.c: removed & renamed some functions from
|
||||
* gimpui.[ch] (see below).
|
||||
*
|
||||
* * libgimp/Makefile.am
|
||||
* * libgimp/gimpwidgets.[ch]; new files. Functions moved from
|
||||
* app/gimpui.[ch]. Added a constructor for the label + hscale +
|
||||
* entry combination used in many plugins (now hscale + spinbutton).
|
||||
*
|
||||
* * libgimp/gimpui.h: include gimpwidgets.h
|
||||
*
|
||||
* * plug-ins/megawidget/megawidget.[ch]: removed all functions
|
||||
* except the preview stuff (I'm not yet sure how to implement this
|
||||
* in libgimp because the libgimp preview should be general enough to
|
||||
* replace all the other plugin previews, too).
|
||||
*
|
||||
* * plug-ins/borderaverage/Makefile.am
|
||||
* * plug-ins/borderaverage/borderaverage.c
|
||||
* * plug-ins/common/plugin-defs.pl
|
||||
* * plug-ins/common/Makefile.am
|
||||
* * plug-ins/common/aa.c
|
||||
* * plug-ins/common/align_layers.c
|
||||
* * plug-ins/common/animationplay.c
|
||||
* * plug-ins/common/apply_lens.c
|
||||
* * plug-ins/common/blinds.c
|
||||
* * plug-ins/common/bumpmap.c
|
||||
* * plug-ins/common/checkerboard.c
|
||||
* * plug-ins/common/colorify.c
|
||||
* * plug-ins/common/convmatrix.c
|
||||
* * plug-ins/common/cubism.c
|
||||
* * plug-ins/common/curve_bend.c
|
||||
* * plug-ins/common/deinterlace.c
|
||||
* * plug-ins/common/despeckle.c
|
||||
* * plug-ins/common/destripe.c
|
||||
* * plug-ins/common/displace.c
|
||||
* * plug-ins/common/edge.c
|
||||
* * plug-ins/common/emboss.c
|
||||
* * plug-ins/common/hot.c
|
||||
* * plug-ins/common/nlfilt.c
|
||||
* * plug-ins/common/pixelize.c
|
||||
* * plug-ins/common/waves.c
|
||||
* * plug-ins/sgi/sgi.c
|
||||
* * plug-ins/sinus/sinus.c: ui updates like removing megawidget,
|
||||
* using the dialog constructor, I18N fixes, indentation, ...
|
||||
*
|
||||
* Revision 1.22 2000/01/06 16:40:17 mitch
|
||||
* 2000-01-06 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * app/[all files using the dialog or action area constructors]
|
||||
* * libgimp/gimpdialog.[ch]: added a "slot_object" agrument to the
|
||||
* constructors' va_args lists to allow the action area buttons to be
|
||||
* connected wich gtk_signal_connect_object().
|
||||
*
|
||||
* * libgimp/gimphelp.c: show the correct help page for plugins.
|
||||
*
|
||||
* * plug-ins/common/CEL.c
|
||||
* * plug-ins/common/CML_explorer.c
|
||||
* * plug-ins/common/Makefile.am
|
||||
* * plug-ins/common/aa.c
|
||||
* * plug-ins/common/align_layers.c
|
||||
* * plug-ins/common/animationplay.c
|
||||
* * plug-ins/common/apply_lens.c
|
||||
* * plug-ins/common/blinds.c
|
||||
* * plug-ins/common/blur.c
|
||||
* * plug-ins/common/bumpmap.c
|
||||
* * plug-ins/common/checkerboard.c
|
||||
* * plug-ins/common/colorify.c
|
||||
* * plug-ins/common/colortoalpha.c
|
||||
* * plug-ins/common/compose.c
|
||||
* * plug-ins/common/convmatrix.c
|
||||
* * plug-ins/common/csource.c
|
||||
* * plug-ins/common/cubism.c
|
||||
* * plug-ins/common/curve_bend.c
|
||||
* * plug-ins/common/decompose.c
|
||||
* * plug-ins/common/deinterlace.c
|
||||
* * plug-ins/common/depthmerge.c
|
||||
* * plug-ins/common/despeckle.c
|
||||
* * plug-ins/common/destripe.c
|
||||
* * plug-ins/common/diffraction.c
|
||||
* * plug-ins/common/displace.c
|
||||
* * plug-ins/common/grid.c
|
||||
* * plug-ins/helpbrowser/Makefile.am
|
||||
* * plug-ins/helpbrowser/helpbrowser.c: use the dialog constructor
|
||||
* and enable the "F1" help key.
|
||||
*
|
||||
* Revision 1.21 1999/12/29 18:07:43 neo
|
||||
* NEVER EVER use sprintf together with _(...) !
|
||||
*
|
||||
*
|
||||
* --Sven
|
||||
*
|
||||
* Revision 1.20 1999/12/27 18:43:09 neo
|
||||
* small dialog changes and german translation update
|
||||
*
|
||||
*
|
||||
* --Sven
|
||||
*
|
||||
* Revision 1.19 1997/01/03 15:15:10 yasuhiro
|
||||
* 1999-12-20 Shirasaki Yasuhiro <yasuhiro@gnome.gr.jp>
|
||||
*
|
||||
* * plug-ins/common/blinds.c
|
||||
* * plug-ins/common/curve_bend.c
|
||||
* * plug-ins/common/deinterlace.c
|
||||
* * plug-ins/common/despeckle.c
|
||||
* * po-plug-ins/POTFILES.in: Added gettext support
|
||||
*
|
||||
* -- yasuhiro
|
||||
*
|
||||
* Revision 1.18 1999/11/23 23:49:42 neo
|
||||
* added dots to all menu entries of interactive plug-ins and did the usual
|
||||
* action area fixes on lots of them
|
||||
*
|
||||
*
|
||||
*
|
||||
* --Sven
|
||||
*
|
||||
* Revision 1.17 1999/10/24 20:48:58 pcg
|
||||
* api change #2, fix #1
|
||||
*
|
||||
* Revision 1.16 1999/10/17 00:07:38 pcg
|
||||
* API PATCH #2 or so
|
||||
*
|
||||
* Revision 1.15 1999/04/23 06:35:14 asbjoer
|
||||
* use MAIN macro
|
||||
*
|
||||
* Revision 1.14 1999/01/15 17:33:24 unammx
|
||||
* 1999-01-15 Federico Mena Quintero <federico@nuclecu.unam.mx>
|
||||
*
|
||||
* * Updated gtk_toggle_button_set_state() to
|
||||
* gtk_toggle_button_set_active() in all the files.
|
||||
*
|
||||
* Revision 1.13 1998/06/06 23:22:16 yosh
|
||||
* * adding Lighting plugin
|
||||
*
|
||||
* * updated despeckle, png, sgi, and sharpen
|
||||
*
|
||||
* -Yosh
|
||||
*
|
||||
* Revision 1.21 1998/05/17 15:57:33 mike
|
||||
* Removed extra variables.
|
||||
* Removed signal handlers (used for debugging)
|
||||
*
|
||||
* Revision 1.20 1998/04/27 15:59:17 mike
|
||||
* Fixed RGB preview problem...
|
||||
*
|
||||
* Revision 1.19 1998/04/27 15:45:27 mike
|
||||
* OK, put the shadow buffer stuff back in - without shadowing the undo stuff
|
||||
* will *not* work... sigh...
|
||||
* Doubled tile cache to avoid cache thrashing with shadow buffer.
|
||||
*
|
||||
* Revision 1.18 1998/04/27 15:39:48 mike
|
||||
* Fixed destination region code - was using a shadow buffer when it wasn't
|
||||
* needed.
|
||||
* Now add 1 to the number of tiles needed in the cache to avoid possible
|
||||
* rounding error and resulting cache thrashing.
|
||||
*
|
||||
* Revision 1.17 1998/04/23 14:39:47 mike
|
||||
* Updated preview code to handle images with alpha (preview now shows checker
|
||||
* pattern).
|
||||
* Added call to gtk_window_set_wmclass() to make sure the GIMP icon is used
|
||||
* by default.
|
||||
*
|
||||
* Revision 1.16 1998/01/22 14:35:03 mike
|
||||
* Added black & white level controls.
|
||||
* Fixed bug in despeckle code that caused the borders to darken.
|
||||
*
|
||||
* Revision 1.15 1998/01/21 21:33:47 mike
|
||||
* Fixed malloc buffer overflow bug - wasn't realloc'ing buffers
|
||||
* when the filter radius changed.
|
||||
*
|
||||
* Revision 1.14 1997/11/14 17:17:59 mike
|
||||
* Updated to dynamically allocate return params in the run() function.
|
||||
*
|
||||
* Revision 1.13 1997/11/12 15:53:34 mike
|
||||
* Added <string.h> header file for Digital UNIX...
|
||||
*
|
||||
* Revision 1.12 1997/10/17 13:56:54 mike
|
||||
* Updated author/contact information.
|
||||
*
|
||||
* Revision 1.11 1997/06/12 16:58:11 mike
|
||||
* Optimized final despeckle - now grab gimp_tile_height() rows at a time
|
||||
* for faster filtering.
|
||||
*
|
||||
* Revision 1.10 1997/06/08 23:30:29 mike
|
||||
* Improved the preview update speed significantly by loading the entire
|
||||
* source (preview) image first.
|
||||
*
|
||||
* Revision 1.9 1997/06/08 16:48:21 mike
|
||||
* Renamed "adaptive" argument to "type" (filter type).
|
||||
*
|
||||
* Revision 1.8 1997/06/08 12:45:09 mike
|
||||
* Added recursive filter option.
|
||||
* Cleaned up UI.
|
||||
*
|
||||
* Revision 1.7 1997/06/08 04:27:19 mike
|
||||
* Updated documentation.
|
||||
* Moved plug-in back to original location in menu tree.
|
||||
*
|
||||
* Revision 1.6 1997/06/08 04:24:56 mike
|
||||
* Added filter type argument & control.
|
||||
*
|
||||
* Revision 1.5 1997/06/08 04:12:36 mike
|
||||
* Added preview window.
|
||||
*
|
||||
* Revision 1.4 1997/06/08 02:18:22 mike
|
||||
* Updated to adjust the despeckling radius based upon the window's
|
||||
* histogram. This improves filter quality significantly as surface
|
||||
* details are preserved and not blurred...
|
||||
*
|
||||
* Revision 1.3 1997/06/07 01:29:47 mike
|
||||
* Added some minor optimizations.
|
||||
* Updated version to 1.01.
|
||||
* Fixed minor bug in dialog_ientry_update() - was using gdouble instead
|
||||
* of gint for new_value...
|
||||
*
|
||||
* Revision 1.2 1997/06/07 01:03:07 mike
|
||||
* Updated docos, changed maximum radius to 20.
|
||||
*
|
||||
* Revision 1.1 1997/06/07 00:01:15 mike
|
||||
* Initial Revision.
|
||||
* See ChangeLog
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -277,7 +277,6 @@ plasma_dialog (void)
|
|||
GtkWidget *dlg;
|
||||
GtkWidget *frame;
|
||||
GtkWidget *table;
|
||||
GtkWidget *spinbutton;
|
||||
GtkWidget *seed_hbox;
|
||||
GtkObject *adj;
|
||||
gchar **argv;
|
||||
|
|
|
|||
|
|
@ -184,8 +184,6 @@ static inline void randomize_prepare_row (GPixelRgn *pixel_rgn,
|
|||
static gint randomize_dialog (void);
|
||||
static void randomize_ok_callback (GtkWidget *widget,
|
||||
gpointer data);
|
||||
static void randomize_time_toggle_update (GtkWidget *widget,
|
||||
gpointer data);
|
||||
|
||||
/************************************ Guts ***********************************/
|
||||
|
||||
|
|
@ -791,17 +789,3 @@ randomize_ok_callback (GtkWidget *widget,
|
|||
|
||||
gtk_widget_destroy (GTK_WIDGET (data));
|
||||
}
|
||||
|
||||
static void
|
||||
randomize_time_toggle_update (GtkWidget *widget,
|
||||
gpointer data)
|
||||
{
|
||||
gint *toggle_val;
|
||||
|
||||
toggle_val = (gint *) data;
|
||||
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
|
||||
*toggle_val = SEED_TIME;
|
||||
else
|
||||
*toggle_val = SEED_USER;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,174 +39,7 @@
|
|||
*
|
||||
* Revision History:
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.17 2000/01/25 23:05:59 mitch
|
||||
* 2000-01-25 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * app/appenv.h: removed BOUNDS, MINIMUM and MAXIMUM. No need to
|
||||
* include both <glib.h> and <gtk/gtk.h>.
|
||||
*
|
||||
* * app/*
|
||||
* * tools/pdbgen/pdb/text_tool.pdb: s/BOUNDS/CLAMP/,
|
||||
* same for MIN and MAX.
|
||||
*
|
||||
* * app/preferences_dialog.c: the "Check Size" widget was connected
|
||||
* to the transparency_type variable.
|
||||
*
|
||||
* * plug-ins/common/sobel.c: removed definitions of MIN and ROUND.
|
||||
*
|
||||
* * libgimp/gimp.h: #include "gimplimits.h" and "gimpcolorspace.h".
|
||||
*
|
||||
* * plug-ins/*: don't include the two files.
|
||||
*
|
||||
* Revision 1.16 2000/01/15 15:32:28 mitch
|
||||
* 2000-01-15 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * libgimp/gimpwidgets.[ch]: added a float adjustment callback.
|
||||
*
|
||||
* * plug-ins/common/bumpmap.c
|
||||
* * plug-ins/common/depthmerge.c
|
||||
* * plug-ins/common/despeckle.c
|
||||
* * plug-ins/common/destripe.c
|
||||
* * plug-ins/common/gpb.c
|
||||
* * plug-ins/common/iwarp.c
|
||||
* * plug-ins/common/polar.c
|
||||
* * plug-ins/common/sharpen.c
|
||||
* * plug-ins/common/tileit.c
|
||||
* * plug-ins/common/whirlpinch.c
|
||||
* * plug-ins/common/wind.c:
|
||||
*
|
||||
* - Some more hscale+spinbutton instead of hscale+entry widgets.
|
||||
* - Get the CHECK_SIZE constants from libgimp in some plugins.
|
||||
*
|
||||
* Revision 1.15 2000/01/08 15:23:28 mitch
|
||||
* 2000-01-08 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* * plug-ins/common/Makefile.am
|
||||
* * plug-ins/common/hrz.c
|
||||
* * plug-ins/common/papertile.c
|
||||
* * plug-ins/common/pat.c
|
||||
* * plug-ins/common/pixelize.c
|
||||
* * plug-ins/common/plasma.c
|
||||
* * plug-ins/common/plugindetails.c
|
||||
* * plug-ins/common/png.c
|
||||
* * plug-ins/common/pnm.c
|
||||
* * plug-ins/common/polar.c
|
||||
* * plug-ins/common/ps.c
|
||||
* * plug-ins/common/psp.c
|
||||
* * plug-ins/common/randomize.c
|
||||
* * plug-ins/common/ripple.c
|
||||
* * plug-ins/common/sample_colorize.c
|
||||
* * plug-ins/common/scatter_hsv.c
|
||||
* * plug-ins/common/screenshot.c
|
||||
* * plug-ins/common/sel_gauss.c
|
||||
* * plug-ins/common/sharpen.c
|
||||
* * plug-ins/common/shift.c
|
||||
* * plug-ins/common/smooth_palette.c
|
||||
* * plug-ins/common/snoise.c
|
||||
* * plug-ins/common/sobel.c
|
||||
* * plug-ins/common/sparkle.c
|
||||
* * plug-ins/common/spheredesigner.c
|
||||
* * plug-ins/common/spread.c
|
||||
* * plug-ins/common/sunras.c: more plugins which use the dialog
|
||||
* constructor. Hacked many UIs to look like the app's dialogs.
|
||||
*
|
||||
* Revision 1.14 2000/01/07 17:18:44 yasuhiro
|
||||
* * plug-ins/common/scatter_hsv.c
|
||||
* * plug-ins/common/semiflatten.c
|
||||
* * plug-ins/common/sharpen.c
|
||||
* * plug-ins/common/shift.c
|
||||
* * plug-ins/common/smooth_palette.c
|
||||
* * plug-ins/common/snoise.c
|
||||
* * plug-ins/common/sobel.c
|
||||
* * plug-ins/common/sparkle.c
|
||||
* * plug-ins/common/spread.c
|
||||
* * po-plug-ins/POTFILES.in: added gettext support.
|
||||
*
|
||||
* -- yasuhiro
|
||||
*
|
||||
* Revision 1.13 1999/11/23 23:49:42 neo
|
||||
* added dots to all menu entries of interactive plug-ins and did the usual
|
||||
* action area fixes on lots of them
|
||||
*
|
||||
*
|
||||
*
|
||||
* --Sven
|
||||
*
|
||||
* Revision 1.12 1999/10/24 20:48:59 pcg
|
||||
* api change #2, fix #1
|
||||
*
|
||||
* Revision 1.11 1999/10/17 00:07:40 pcg
|
||||
* API PATCH #2 or so
|
||||
*
|
||||
* Revision 1.10 1999/04/22 14:05:58 asbjoer
|
||||
* use MAIN macro
|
||||
*
|
||||
* Revision 1.9 1999/03/28 22:03:12 raph
|
||||
* Fixed a silly bug causing sharpen to not work in the non-rgb cases.
|
||||
*
|
||||
* Revision 1.8 1999/03/15 22:38:36 raph
|
||||
* Improved the quality of the algorithm in the sharpen plugin.
|
||||
*
|
||||
* Revision 1.7 1998/06/06 23:22:22 yosh
|
||||
* * adding Lighting plugin
|
||||
*
|
||||
* * updated despeckle, png, sgi, and sharpen
|
||||
*
|
||||
* -Yosh
|
||||
*
|
||||
* Revision 1.14 1998/05/17 16:01:33 mike
|
||||
* Removed signal handler stuff used for debugging.
|
||||
* Added gtk_rc_parse().
|
||||
* Removed extra variables.
|
||||
*
|
||||
* Revision 1.13 1998/04/27 15:55:38 mike
|
||||
* Sharpen would shift the image down one pixel; was using the wrong "source"
|
||||
* row...
|
||||
*
|
||||
* Revision 1.12 1998/04/27 15:45:27 mike
|
||||
* OK, put the shadow buffer stuff back in - without shadowing the undo stuff
|
||||
* will *not* work... sigh...
|
||||
* Doubled tile cache to avoid cache thrashing with shadow buffer.
|
||||
*
|
||||
* Revision 1.11 1998/04/27 15:33:45 mike
|
||||
* Updated to use LUTs for coefficients.
|
||||
* Broke out filter code for GRAY, GRAYA, RGB, RGBA modes.
|
||||
* Fixed destination region code - was using a shadow buffer when it wasn't
|
||||
* needed.
|
||||
* Now add 1 to the number of tiles needed in the cache to avoid possible
|
||||
* rounding error and resulting cache thrashing.
|
||||
*
|
||||
* Revision 1.10 1998/04/23 14:39:47 mike
|
||||
* Whoops - wasn't copying the preview image over for RGB mode...
|
||||
*
|
||||
* Revision 1.9 1998/04/23 13:56:02 mike
|
||||
* Updated preview to do checkerboard pattern for transparency (thanks Yosh!)
|
||||
* Added gtk_window_set_wmclass() call to make sure this plug-in gets to use
|
||||
* the standard GIMP icon if none is otherwise created...
|
||||
*
|
||||
* Revision 1.8 1998/04/22 16:25:45 mike
|
||||
* Fixed RGBA preview problems...
|
||||
*
|
||||
* Revision 1.7 1998/03/12 18:48:52 mike
|
||||
* Fixed pixel errors around the edge of the bounding rectangle - the
|
||||
* original pixels weren't being written back to the image...
|
||||
*
|
||||
* Revision 1.6 1997/11/14 17:17:59 mike
|
||||
* Updated to dynamically allocate return params in the run() function.
|
||||
*
|
||||
* Revision 1.5 1997/10/17 13:56:54 mike
|
||||
* Updated author/contact information.
|
||||
*
|
||||
* Revision 1.4 1997/09/29 17:16:29 mike
|
||||
* To average 8 numbers you do *not* divide by 9! This caused the brightening
|
||||
* problem when sharpening was "turned up".
|
||||
*
|
||||
* Revision 1.2 1997/06/08 22:27:35 mike
|
||||
* Updated sharpen code for hard-coded 3x3 convolution matrix.
|
||||
*
|
||||
* Revision 1.1 1997/06/08 16:46:07 mike
|
||||
* Initial revision
|
||||
* See ChangeLog
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -193,19 +193,11 @@ run (char *name,
|
|||
char *l_env;
|
||||
|
||||
char l_extension[32];
|
||||
char *l_basename_ptr;
|
||||
char *l_palette_ptr;
|
||||
static GParam values[2];
|
||||
GRunModeType run_mode;
|
||||
GStatusType status = STATUS_SUCCESS;
|
||||
gint32 image_id;
|
||||
gint32 nr;
|
||||
long range_from, range_to;
|
||||
gint32 inverse_order;
|
||||
gint32 no_alpha;
|
||||
long framerate;
|
||||
#define FRAME_BASENAME_LEN 256
|
||||
char frame_basename[FRAME_BASENAME_LEN];
|
||||
|
||||
gint32 l_rc;
|
||||
|
||||
|
|
|
|||
|
|
@ -412,10 +412,12 @@ void gdt_render_text(GdtVals *data)
|
|||
void gdt_render_text_p(GdtVals *data, gboolean show_progress)
|
||||
{
|
||||
gint layer_ox, layer_oy, i, nret_vals, xoffs;
|
||||
gint32 layer_f, selection_channel;
|
||||
gint32 text_width, text_height;
|
||||
gint32 text_ascent, text_descent;
|
||||
gint32 layer_width, layer_height;
|
||||
gint32 layer_f;
|
||||
gint32 selection_channel = -1;
|
||||
gint32 text_width = 0;
|
||||
gint32 text_height = 0;
|
||||
gint32 text_ascent, text_descent;
|
||||
gint32 layer_width, layer_height;
|
||||
gint32 space_width;
|
||||
gchar **text_style, **text_lines;
|
||||
gint32 *text_lines_w;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
#include <math.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include "libgimp/stdplugins-intl.h"
|
||||
#include <libgimp/stdplugins-intl.h>
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
# include <io.h>
|
||||
|
|
@ -6474,10 +6474,9 @@ static void
|
|||
gfig_copy_menu_callback(GtkWidget *widget, gpointer data)
|
||||
{
|
||||
/* Create new entry with name + copy at end & copy object into it */
|
||||
gchar *new_name =
|
||||
g_strdup_printf(new_name, _("%s copy"), gfig_obj_for_menu->draw_name);
|
||||
new_gfig_obj(new_name);
|
||||
g_free(new_name);
|
||||
gchar *new_name = g_strdup_printf (_("%s copy"), gfig_obj_for_menu->draw_name);
|
||||
new_gfig_obj (new_name);
|
||||
g_free (new_name);
|
||||
|
||||
/* Copy objs across */
|
||||
current_obj->obj_list = copy_all_objs(gfig_obj_for_menu->obj_list);
|
||||
|
|
|
|||
|
|
@ -32,325 +32,15 @@
|
|||
*
|
||||
* Revision History:
|
||||
*
|
||||
* $Log$
|
||||
* Revision 1.18 2000/01/27 18:42:27 asbjoer
|
||||
* os/2 patch
|
||||
*
|
||||
* Revision 1.17 2000/01/26 16:00:48 neo
|
||||
* updated print plug-in
|
||||
*
|
||||
*
|
||||
* --Sven
|
||||
*
|
||||
* Revision 1.12 2000/01/08 23:30:56 rlk
|
||||
* Y2K copyright
|
||||
*
|
||||
* Revision 1.11 2000/01/03 13:25:13 rlk
|
||||
* Fix from Salvador Pinto Abreu <spa@khromeleque.dmat.uevora.pt>
|
||||
*
|
||||
* Revision 1.10 1999/11/23 02:11:37 rlk
|
||||
* Rationalize variables, pass 3
|
||||
*
|
||||
* Revision 1.9 1999/11/23 01:45:00 rlk
|
||||
* Rationalize variables -- pass 2
|
||||
*
|
||||
* Revision 1.8 1999/10/26 23:36:51 rlk
|
||||
* Comment out all remaining 16-bit code, and rename 16-bit functions to "standard" names
|
||||
*
|
||||
* Revision 1.7 1999/10/26 02:10:30 rlk
|
||||
* Mostly fix save/load
|
||||
*
|
||||
* Move all gimp, glib, gtk stuff into print.c (take it out of everything else).
|
||||
* This should help port it to more general purposes later.
|
||||
*
|
||||
* Revision 1.6 1999/10/25 23:31:59 rlk
|
||||
* 16-bit clean
|
||||
*
|
||||
* Revision 1.5 1999/10/21 01:27:37 rlk
|
||||
* More progress toward full 16-bit rendering
|
||||
*
|
||||
* Revision 1.4 1999/10/17 23:44:07 rlk
|
||||
* 16-bit everything (untested)
|
||||
*
|
||||
* Revision 1.3 1999/10/14 01:59:59 rlk
|
||||
* Saturation
|
||||
*
|
||||
* Revision 1.2 1999/09/12 00:12:24 rlk
|
||||
* Current best stuff
|
||||
*
|
||||
* Revision 1.14 1999/05/29 16:35:29 yosh
|
||||
* * configure.in
|
||||
* * Makefile.am: removed tips files, AC_SUBST GIMP_PLUGINS and
|
||||
* GIMP_MODULES so you can easily skip those parts of the build
|
||||
*
|
||||
* * acinclude.m4
|
||||
* * config.sub
|
||||
* * config.guess
|
||||
* * ltconfig
|
||||
* * ltmain.sh: libtool 1.3.2
|
||||
*
|
||||
* * app/fileops.c: shuffle #includes to avoid warning about MIN and
|
||||
* MAX
|
||||
*
|
||||
* [ The following is a big i18n patch from David Monniaux
|
||||
* <david.monniaux@ens.fr> ]
|
||||
*
|
||||
* * tips/gimp_conseils.fr.txt
|
||||
* * tips/gimp_tips.txt
|
||||
* * tips/Makefile.am
|
||||
* * configure.in: moved tips to separate dir
|
||||
*
|
||||
* * po-plugins: new dir for plug-in translation files
|
||||
*
|
||||
* * configure.in: add po-plugins dir and POTFILES processing
|
||||
*
|
||||
* * app/boundary.c
|
||||
* * app/brightness_contrast.c
|
||||
* * app/by_color_select.c
|
||||
* * app/color_balance.c
|
||||
* * app/convert.c
|
||||
* * app/curves.c
|
||||
* * app/free_select.c
|
||||
* * app/gdisplay.c
|
||||
* * app/gimpimage.c
|
||||
* * app/gimpunit.c
|
||||
* * app/gradient.c
|
||||
* * app/gradient_select.c
|
||||
* * app/install.c
|
||||
* * app/session.c: various i18n tweaks
|
||||
*
|
||||
* * app/tips_dialog.c: localize tips filename
|
||||
*
|
||||
* * libgimp/gimpunit.c
|
||||
* * libgimp/gimpunitmenu.c: #include "config.h"
|
||||
*
|
||||
* * plug-ins/CEL
|
||||
* * plug-ins/CML_explorer
|
||||
* * plug-ins/Lighting
|
||||
* * plug-ins/apply_lens
|
||||
* * plug-ins/autostretch_hsv
|
||||
* * plug-ins/blur
|
||||
* * plug-ins/bmp
|
||||
* * plug-ins/borderaverage
|
||||
* * plug-ins/bumpmap
|
||||
* * plug-ins/bz2
|
||||
* * plug-ins/checkerboard
|
||||
* * plug-ins/colorify
|
||||
* * plug-ins/compose
|
||||
* * plug-ins/convmatrix
|
||||
* * plug-ins/cubism
|
||||
* * plug-ins/depthmerge
|
||||
* * plug-ins/destripe
|
||||
* * plug-ins/gif
|
||||
* * plug-ins/gifload
|
||||
* * plug-ins/jpeg
|
||||
* * plug-ins/mail
|
||||
* * plug-ins/oilify
|
||||
* * plug-ins/png
|
||||
* * plug-ins/print
|
||||
* * plug-ins/ps
|
||||
* * plug-ins/xbm
|
||||
* * plug-ins/xpm
|
||||
* * plug-ins/xwd: plug-in i18n stuff
|
||||
*
|
||||
* -Yosh
|
||||
*
|
||||
* Revision 1.13 1999/05/27 19:11:33 asbjoer
|
||||
* use g_strncasecmp()
|
||||
*
|
||||
* Revision 1.12 1999/05/01 17:54:09 asbjoer
|
||||
* os2 printing
|
||||
*
|
||||
* Revision 1.11 1999/04/15 21:49:01 yosh
|
||||
* * applied gimp-lecorfec-99041[02]-0, changes follow
|
||||
*
|
||||
* * plug-ins/FractalExplorer/Dialogs.h (make_color_map):
|
||||
* replaced free with free to fix segfault.
|
||||
*
|
||||
* * plug-ins/Lighting/lighting_preview.c (compute_preview):
|
||||
* allocate xpostab and ypostab only when needed (it could also be
|
||||
* allocated on stack with a compilation-fixed size like MapObject).
|
||||
* It avoids to lose some Kb on each preview :)
|
||||
* Also reindented (unfortunate C-c C-q) some other lines.
|
||||
*
|
||||
* * plug-ins/Lighting/lighting_main.c (run):
|
||||
* release allocated postabs.
|
||||
*
|
||||
* * plug-ins/Lighting/lighting_ui.c:
|
||||
* callbacks now have only one argument because gck widget use
|
||||
* gtk_signal_connect_object. Caused segfault for scale widget.
|
||||
*
|
||||
* * plug-ins/autocrop/autocrop.c (doit):
|
||||
* return if image has only background (thus fixing a segfault).
|
||||
*
|
||||
* * plug-ins/emboss/emboss.c (pluginCore, emboss_do_preview):
|
||||
* replaced malloc/free with malloc/free (unneeded, but
|
||||
* shouldn't everyone use glib calls ? :)
|
||||
*
|
||||
* * plug-ins/flame/flame.c :
|
||||
* replaced a segfaulting free, and several harmless malloc/free pairs.
|
||||
*
|
||||
* * plug-ins/flame/megawidget.c (mw_preview_build):
|
||||
* replaced harmless malloc/free pair.
|
||||
* Note : mwp->bits is malloc'ed but seems to be never freed.
|
||||
*
|
||||
* * plug-ins/fractaltrace/fractaltrace.c (pixels_free):
|
||||
* replaced a bunch of segfaulting free.
|
||||
* (pixels_get, dialog_show): replaced gtk_signal_connect_object
|
||||
* with gtk_signal_connect to accomodate callbacks (caused STRANGE
|
||||
* dialog behaviour, coz you destroyed buttons one by one).
|
||||
*
|
||||
* * plug-ins/illusion/illusion.c (dialog):
|
||||
* same gtk_signal_connect_object replacement for same reasons.
|
||||
*
|
||||
* * plug-ins/libgck/gck/gckcolor.c :
|
||||
* changed all gck_rgb_to_color* functions to use a static GdkColor
|
||||
* instead of a malloc'ed area. Provided reentrant functions with
|
||||
* the old behaviour (gck_rgb_to_color*_r). Made some private functions
|
||||
* static, too.
|
||||
* gck_rgb_to_gdkcolor now use the new functions while
|
||||
* gck_rgb_to_gdkcolor_r is the reentrant version.
|
||||
* Also affected by this change: gck_gc_set_foreground and
|
||||
* gck_gc_set_background (no more free(color)).
|
||||
*
|
||||
* * plug-ins/libgck/gck/gckcolor.h :
|
||||
* added the gck_rgb_to_gdkcolor_r proto.
|
||||
*
|
||||
* * plug-ins/lic/lic.c (ok_button_clicked, cancel_button_clicked) :
|
||||
* segfault on gtk_widget_destroy, now calls gtk_main_quit.
|
||||
* (dialog_destroy) : segfault on window closure when called by
|
||||
* "destroy" event. Now called by "delete_event".
|
||||
*
|
||||
* * plug-ins/megawidget/megawidget.c (mw_preview_build):
|
||||
* replaced harmless malloc/free pair.
|
||||
* Note : mwp->bits is malloc'ed but seems to be never freed.
|
||||
*
|
||||
* * plug-ins/png/png.c (load_image):
|
||||
* replaced 2 segfaulting free.
|
||||
*
|
||||
* * plug-ins/print/print-ps.c (ps_print):
|
||||
* replaced a segfaulting free (called many times :).
|
||||
*
|
||||
* * plug-ins/sgi/sgi.c (load_image, save_image):
|
||||
* replaced a bunch of segfaulting free, and did some harmless
|
||||
* inits to avoid a few gcc warnings.
|
||||
*
|
||||
* * plug-ins/wind/wind.c (render_wind):
|
||||
* replaced a segfaulting free.
|
||||
* (render_blast): replaced harmless malloc/free pair.
|
||||
*
|
||||
* * plug-ins/bmp/bmpread.c (ReadImage):
|
||||
* yet another free()/free() problem fixed.
|
||||
*
|
||||
* * plug-ins/exchange/exchange.c (real_exchange):
|
||||
* ditto.
|
||||
*
|
||||
* * plug-ins/fp/fp.h: added Frames_Check_Button_In_A_Box proto.
|
||||
* * plug-ins/fp/fp_gtk.c: closing subdialogs via window manager
|
||||
* wasn't handled, thus leading to errors and crashes.
|
||||
* Now delete_event signals the dialog control button
|
||||
* to close a dialog with the good way.
|
||||
*
|
||||
* * plug-ins/ifscompose/ifscompose.c (value_pair_create):
|
||||
* tried to set events mask on scale widget (a NO_WINDOW widget).
|
||||
*
|
||||
* * plug-ins/png/png.c (save_image):
|
||||
* Replaced 2 free() with free() for malloc'ed memory.
|
||||
* Mysteriously I corrected the loading bug but not the saving one :)
|
||||
*
|
||||
* -Yosh
|
||||
*
|
||||
* Revision 1.10 1998/08/28 23:01:46 yosh
|
||||
* * acconfig.h
|
||||
* * configure.in
|
||||
* * app/main.c: added check for putenv and #ifdefed it's usage since NeXTStep is
|
||||
* lame
|
||||
*
|
||||
* * libgimp/gimp.c
|
||||
* * app/main.c
|
||||
* * app/plug_in.c: conditionally compile shared mem stuff so platforms without
|
||||
* it can still work
|
||||
*
|
||||
* * plug-ins/CEL/CEL.c
|
||||
* * plug-ins/palette/palette.c
|
||||
* * plug-ins/print/print-escp2.c
|
||||
* * plug-ins/print/print-pcl.c
|
||||
* * plug-ins/print/print-ps.c: s/strdup/g_strdup/ for portability
|
||||
*
|
||||
* -Yosh
|
||||
*
|
||||
* Revision 1.9 1998/05/17 07:16:47 yosh
|
||||
* 0.99.31 fun
|
||||
*
|
||||
* updated print plugin
|
||||
*
|
||||
* -Yosh
|
||||
*
|
||||
* Revision 1.13 1998/05/15 21:01:51 mike
|
||||
* Updated image positioning code (invert top and center left/top independently)
|
||||
* Updated ps_imageable_area() to return a default imageable area when no PPD
|
||||
* file is available.
|
||||
*
|
||||
* Revision 1.12 1998/05/11 23:56:56 mike
|
||||
* Removed unused outptr variable.
|
||||
*
|
||||
* Revision 1.11 1998/05/08 19:20:50 mike
|
||||
* Updated to support PPD files, media size, imageable area, and parameter
|
||||
* functions.
|
||||
* Added support for scaling modes - scale by percent or scale by PPI.
|
||||
* Updated Ascii85 output - some Level 2 printers are buggy and won't accept
|
||||
* whitespace in the data stream.
|
||||
* Now use image dictionaries with Level 2 printers - allows interpolation
|
||||
* flag to be sent (not all printers use this flag).
|
||||
*
|
||||
* Revision 1.10 1998/01/22 15:38:46 mike
|
||||
* Updated copyright notice.
|
||||
* Whoops - wasn't encoding correctly for portrait output to level 2 printers!
|
||||
*
|
||||
* Revision 1.9 1998/01/21 21:33:47 mike
|
||||
* Added support for Level 2 filters; images are now sent in hex or
|
||||
* base-85 ASCII as necessary (faster printing).
|
||||
*
|
||||
* Revision 1.8 1997/11/12 15:57:48 mike
|
||||
* Minor changes for clean compiles under Digital UNIX.
|
||||
*
|
||||
* Revision 1.8 1997/11/12 15:57:48 mike
|
||||
* Minor changes for clean compiles under Digital UNIX.
|
||||
*
|
||||
* Revision 1.7 1997/07/30 20:33:05 mike
|
||||
* Final changes for 1.1 release.
|
||||
*
|
||||
* Revision 1.7 1997/07/30 20:33:05 mike
|
||||
* Final changes for 1.1 release.
|
||||
*
|
||||
* Revision 1.6 1997/07/30 18:47:39 mike
|
||||
* Added scaling, orientation, and offset options.
|
||||
*
|
||||
* Revision 1.5 1997/07/26 18:38:55 mike
|
||||
* Bug - was using asctime instead of ctime... D'oh!
|
||||
*
|
||||
* Revision 1.4 1997/07/26 18:19:54 mike
|
||||
* Fixed positioning/scaling bug.
|
||||
*
|
||||
* Revision 1.3 1997/07/03 13:26:46 mike
|
||||
* Updated documentation for 1.0 release.
|
||||
*
|
||||
* Revision 1.2 1997/07/02 18:49:36 mike
|
||||
* Forgot to free memory buffers...
|
||||
*
|
||||
* Revision 1.2 1997/07/02 18:49:36 mike
|
||||
* Forgot to free memory buffers...
|
||||
*
|
||||
* Revision 1.1 1997/07/02 13:51:53 mike
|
||||
* Initial revision
|
||||
* See ChangeLog
|
||||
*/
|
||||
|
||||
#include "print.h"
|
||||
#include <time.h>
|
||||
#include <glib.h>
|
||||
|
||||
/*#define DEBUG*/
|
||||
|
||||
|
||||
/*
|
||||
* Local variables...
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -41,17 +41,10 @@
|
|||
*
|
||||
* See ChangeLog
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include "print.h"
|
||||
|
||||
/*
|
||||
* All Gimp-specific code is in this file.
|
||||
*/
|
||||
#include <gtk/gtk.h>
|
||||
#include <libgimp/gimp.h>
|
||||
#define PLUG_IN_VERSION "3.0.5 - 13 Jan 2000"
|
||||
#define PLUG_IN_NAME "Print"
|
||||
|
||||
#include <math.h>
|
||||
#include <signal.h>
|
||||
#ifdef __EMX__
|
||||
|
|
@ -60,38 +53,15 @@
|
|||
#include <os2.h>
|
||||
#endif
|
||||
|
||||
#include <libgimp/gimpui.h>
|
||||
#if 0
|
||||
#include <libgimp/stdplugins-intl.h>
|
||||
#else
|
||||
#include <libgimp/gimpintl.h>
|
||||
#include <locale.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
#include <libgimp/gimpui.h>
|
||||
#include <libgimp/stdplugins-intl.h>
|
||||
|
||||
#define PLUG_IN_VERSION "3.0.5 - 13 Jan 2000"
|
||||
#define PLUG_IN_NAME "Print"
|
||||
|
||||
#ifndef LOCALEDIR
|
||||
#define LOCALEDIR g_strconcat (gimp_data_directory (), \
|
||||
G_DIR_SEPARATOR_S, \
|
||||
"locale", \
|
||||
NULL)
|
||||
#endif
|
||||
#ifdef HAVE_LC_MESSAGES
|
||||
#define INIT_I18N() \
|
||||
setlocale(LC_MESSAGES, ""); \
|
||||
bindtextdomain("gimp-std-plugins", LOCALEDIR); \
|
||||
textdomain("gimp-std-plugins")
|
||||
#define INIT_I18N_UI() \
|
||||
gtk_set_locale(); \
|
||||
setlocale (LC_NUMERIC, "C"); \
|
||||
INIT_I18N();
|
||||
#else
|
||||
#define INIT_I18N() \
|
||||
bindtextdomain("gimp-std-plugins", LOCALEDIR); \
|
||||
textdomain("gimp-std-plugins")
|
||||
#define INIT_I18N_UI() \
|
||||
gtk_set_locale(); \
|
||||
setlocale (LC_NUMERIC, "C"); \
|
||||
INIT_I18N();
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Constants for GUI...
|
||||
|
|
@ -270,7 +240,7 @@ printer_t printers[] = /* List of supported printer types */
|
|||
escp2_parameters, default_media_size, escp2_imageable_area, escp2_print },
|
||||
{ N_("EPSON Stylus Photo EX"), "escp2-ex", 1, 7, 0.585, 0.646,
|
||||
escp2_parameters, default_media_size, escp2_imageable_area, escp2_print },
|
||||
{ N_("EPSON Stylus Photo"), "escp2-photo", 1, 8, 0.585, 0.646,
|
||||
{ N_("EPSON Stylus Photo EX"), "escp2-photo", 1, 8, 0.585, 0.646,
|
||||
escp2_parameters, default_media_size, escp2_imageable_area, escp2_print },
|
||||
};
|
||||
|
||||
|
|
@ -3141,7 +3111,6 @@ get_printers(void)
|
|||
int i;
|
||||
FILE *pfile;
|
||||
char line[129],
|
||||
name[17],
|
||||
defname[17];
|
||||
#ifdef __EMX__
|
||||
BYTE pnum;
|
||||
|
|
@ -3179,6 +3148,8 @@ get_printers(void)
|
|||
#ifdef LPSTAT_COMMAND
|
||||
if ((pfile = popen(LPSTAT_COMMAND " -d -p", "r")) != NULL)
|
||||
{
|
||||
char name[17];
|
||||
|
||||
while (fgets(line, sizeof(line), pfile) != NULL &&
|
||||
plist_count < MAX_PLIST)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -78,8 +78,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|||
#define SQUARE(x) ((x) * (x))
|
||||
#define CUBE(x) ((x) * (x) * (x))
|
||||
#define SAME_SIGN(u,v) ((u) >= 0 && (v) >= 0 || (u) < 0 && (v) < 0)
|
||||
#define ROUND(x) ((int) ((int) (x) + .5 * SIGN (x)))
|
||||
#define SIGN(x) ((x) > 0 ? 1 : (x) < 0 ? -1 : 0)
|
||||
#define SROUND(x) ((int) ((int) (x) + .5 * SIGN (x)))
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ real_to_int_coord (real_coordinate_type real_coord)
|
|||
{
|
||||
coordinate_type int_coord;
|
||||
|
||||
int_coord.x = ROUND (real_coord.x);
|
||||
int_coord.y = ROUND (real_coord.y);
|
||||
int_coord.x = SROUND (real_coord.x);
|
||||
int_coord.y = SROUND (real_coord.y);
|
||||
|
||||
return int_coord;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,8 +148,8 @@ Vadd_int_point (const coordinate_type c, const vector_type v)
|
|||
{
|
||||
coordinate_type a;
|
||||
|
||||
a.x = ROUND ((real) c.x + v.dx);
|
||||
a.y = ROUND ((real) c.y + v.dy);
|
||||
a.x = SROUND ((real) c.x + v.dx);
|
||||
a.y = SROUND ((real) c.y + v.dy);
|
||||
return a;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue