mirror of https://github.com/GNOME/gimp.git
Added the mpeg plug-in.
Mon Sep 22 21:19:14 1997 Federico Mena <federico@bananoid.nuclecu.unam.mx> * Added the mpeg plug-in. * Made configure.in and plug-ins/Makefile.am properly detect whether file format libraries are installed and thus decide whether to build some plug-ins or not. Mon Sep 22 17:34:09 1997 Federico Mena <federico@bananoid.nuclecu.unam.mx> * Made 0.99.11 release. See the files NOTES and TODO-DIST for more info.
This commit is contained in:
Federico Mena
Matt Wilson
parent
cdeabf5812
commit
41791a10e5
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
Sat Mar 13 20:22:00 EST 1999 Matt Wilson <msw@gimp.org>
|
||||
|
||||
(some earlier commits on this branch to make app/ build under GTK+
|
||||
1.2 not logged here.)
|
||||
|
||||
* app/colormaps.[ch], app/gdisplay.[ch], app/image_render.c:
|
||||
Changes to allow the GIMP to run without crashing. We need to
|
||||
figure out how to do the image rendering work without the color
|
||||
cube we used to get from GtkPreview. Now that GtkPreview uses
|
||||
gdk_rgb, we don't have the color cube anymore. We may want to
|
||||
move the rendering functions to paint to gdk_rgb instead of
|
||||
gdk_pixmap like the old code did.
|
||||
|
||||
Sun Jan 3 14:39:01 PST 1999 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* plug-ins/ps/ps.c: update from author
|
||||
|
|
|
|||
|
|
@ -218,6 +218,28 @@ get_standard_colormaps ()
|
|||
info = gtk_preview_get_info ();
|
||||
g_visual = info->visual;
|
||||
|
||||
/*
|
||||
if (((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
|
||||
(g_visual->type == GDK_VISUAL_GRAYSCALE)) &&
|
||||
info->reserved_pixels == NULL) {
|
||||
*/ /* XXXXXXXXXX fix me */
|
||||
if (((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
|
||||
(g_visual->type == GDK_VISUAL_GRAYSCALE))) {
|
||||
g_print("GIMP cannot get enough colormaps to boot.\n");
|
||||
g_print("Try exiting other color intensive applications.\n");
|
||||
g_print("Also try enabling the (install-colormap) option in gimprc.\n");
|
||||
swapping_free ();
|
||||
brushes_free ();
|
||||
patterns_free ();
|
||||
palettes_free ();
|
||||
gradients_free ();
|
||||
palette_free ();
|
||||
procedural_db_free ();
|
||||
plug_in_kill ();
|
||||
tile_swap_exit ();
|
||||
gtk_exit(0);
|
||||
}
|
||||
|
||||
g_cmap = info->cmap;
|
||||
#if 0
|
||||
color_pixel_vals = info->color_pixels;
|
||||
|
|
@ -235,6 +257,6 @@ get_standard_colormaps ()
|
|||
g_lookup_green = info->lookup_green;
|
||||
g_lookup_blue = info->lookup_blue;
|
||||
#endif
|
||||
|
||||
|
||||
set_app_colors ();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,8 +23,10 @@
|
|||
/* This is a macro for arranging the red, green, and blue components into
|
||||
* a value acceptable to the target X server
|
||||
*/
|
||||
#if 0
|
||||
#define COLOR_COMPOSE(r,g,b) (lookup_red [r] | lookup_green [g] | lookup_blue [b])
|
||||
|
||||
#endif
|
||||
#define COLOR_COMPOSE(r,g,b) (r | g | b)
|
||||
|
||||
extern GdkVisual *g_visual;
|
||||
extern GdkColormap *g_cmap;
|
||||
|
|
|
|||
|
|
@ -56,35 +56,6 @@ static GdkCursorType default_gdisplay_cursor = GDK_TOP_LEFT_ARROW;
|
|||
|
||||
#define MAX_TITLE_BUF 4096
|
||||
|
||||
/* some useful macros */
|
||||
|
||||
/* unpacking the user scale level (char) */
|
||||
#define SCALESRC(g) (g->scale & 0x00ff)
|
||||
#define SCALEDEST(g) (g->scale >> 8)
|
||||
|
||||
/* finding the effective screen resolution (float) */
|
||||
#define SCREEN_XRES(g) (g->dot_for_dot? g->gimage->xresolution : monitor_xres)
|
||||
#define SCREEN_YRES(g) (g->dot_for_dot? g->gimage->yresolution : monitor_yres)
|
||||
|
||||
/* calculate scale factors (float) */
|
||||
#define SCALEFACTOR_X(g) ((SCALEDEST(g) * SCREEN_XRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->xresolution))
|
||||
#define SCALEFACTOR_Y(g) ((SCALEDEST(g) * SCREEN_YRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->yresolution))
|
||||
|
||||
/* scale values */
|
||||
#define SCALEX(g,x) ((int)(x * SCALEFACTOR_X(g)))
|
||||
#define SCALEY(g,y) ((int)(y * SCALEFACTOR_Y(g)))
|
||||
|
||||
/* unscale values */
|
||||
#define UNSCALEX(g,x) ((int)(x / SCALEFACTOR_X(g)))
|
||||
#define UNSCALEY(g,y) ((int)(y / SCALEFACTOR_Y(g)))
|
||||
|
||||
|
||||
|
||||
#define LOWPASS(x) ((x>0) ? x : 0)
|
||||
/* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
|
||||
|
||||
static char *image_type_strs[] =
|
||||
{
|
||||
"RGB",
|
||||
|
|
@ -231,7 +202,7 @@ gdisplay_delete (GDisplay *gdisp)
|
|||
|
||||
/* free the selection structure */
|
||||
selection_free (gdisp->select);
|
||||
|
||||
|
||||
if (gdisp->scroll_gc)
|
||||
gdk_gc_destroy (gdisp->scroll_gc);
|
||||
|
||||
|
|
|
|||
|
|
@ -31,25 +31,6 @@
|
|||
|
||||
#define SCALESRC(g) (g->scale & 0x00ff)
|
||||
#define SCALEDEST(g) (g->scale >> 8)
|
||||
|
||||
/* finding the effective screen resolution (float) */
|
||||
#define SCREEN_XRES(g) (g->dot_for_dot? g->gimage->xresolution : monitor_xres)
|
||||
#define SCREEN_YRES(g) (g->dot_for_dot? g->gimage->yresolution : monitor_yres)
|
||||
|
||||
/* calculate scale factors (float) */
|
||||
#define SCALEFACTOR_X(g) ((SCALEDEST(g) * SCREEN_XRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->xresolution))
|
||||
#define SCALEFACTOR_Y(g) ((SCALEDEST(g) * SCREEN_YRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->yresolution))
|
||||
|
||||
/* scale values */
|
||||
#define SCALEX(g,x) ((int)(x * SCALEFACTOR_X(g)))
|
||||
#define SCALEY(g,y) ((int)(y * SCALEFACTOR_Y(g)))
|
||||
|
||||
/* unscale values */
|
||||
#define UNSCALEX(g,x) ((int)(x / SCALEFACTOR_X(g)))
|
||||
#define UNSCALEY(g,y) ((int)(y / SCALEFACTOR_Y(g)))
|
||||
|
||||
#define SCALE(g,x) ((x * SCALEDEST(g)) / SCALESRC(g))
|
||||
#define UNSCALE(g,x) ((x * SCALESRC(g)) / SCALEDEST(g))
|
||||
|
||||
|
|
@ -97,7 +78,6 @@ struct _GDisplay
|
|||
|
||||
int offset_x, offset_y; /* offset of display image into raw image */
|
||||
int scale; /* scale factor from original raw image */
|
||||
int dot_for_dot; /* is monitor resolution being ignored? */
|
||||
short draw_guides; /* should the guides be drawn? */
|
||||
short snap_to_guides; /* should the guides be snapped to? */
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -56,35 +56,6 @@ static GdkCursorType default_gdisplay_cursor = GDK_TOP_LEFT_ARROW;
|
|||
|
||||
#define MAX_TITLE_BUF 4096
|
||||
|
||||
/* some useful macros */
|
||||
|
||||
/* unpacking the user scale level (char) */
|
||||
#define SCALESRC(g) (g->scale & 0x00ff)
|
||||
#define SCALEDEST(g) (g->scale >> 8)
|
||||
|
||||
/* finding the effective screen resolution (float) */
|
||||
#define SCREEN_XRES(g) (g->dot_for_dot? g->gimage->xresolution : monitor_xres)
|
||||
#define SCREEN_YRES(g) (g->dot_for_dot? g->gimage->yresolution : monitor_yres)
|
||||
|
||||
/* calculate scale factors (float) */
|
||||
#define SCALEFACTOR_X(g) ((SCALEDEST(g) * SCREEN_XRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->xresolution))
|
||||
#define SCALEFACTOR_Y(g) ((SCALEDEST(g) * SCREEN_YRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->yresolution))
|
||||
|
||||
/* scale values */
|
||||
#define SCALEX(g,x) ((int)(x * SCALEFACTOR_X(g)))
|
||||
#define SCALEY(g,y) ((int)(y * SCALEFACTOR_Y(g)))
|
||||
|
||||
/* unscale values */
|
||||
#define UNSCALEX(g,x) ((int)(x / SCALEFACTOR_X(g)))
|
||||
#define UNSCALEY(g,y) ((int)(y / SCALEFACTOR_Y(g)))
|
||||
|
||||
|
||||
|
||||
#define LOWPASS(x) ((x>0) ? x : 0)
|
||||
/* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
|
||||
|
||||
static char *image_type_strs[] =
|
||||
{
|
||||
"RGB",
|
||||
|
|
@ -231,7 +202,7 @@ gdisplay_delete (GDisplay *gdisp)
|
|||
|
||||
/* free the selection structure */
|
||||
selection_free (gdisp->select);
|
||||
|
||||
|
||||
if (gdisp->scroll_gc)
|
||||
gdk_gc_destroy (gdisp->scroll_gc);
|
||||
|
||||
|
|
|
|||
|
|
@ -31,25 +31,6 @@
|
|||
|
||||
#define SCALESRC(g) (g->scale & 0x00ff)
|
||||
#define SCALEDEST(g) (g->scale >> 8)
|
||||
|
||||
/* finding the effective screen resolution (float) */
|
||||
#define SCREEN_XRES(g) (g->dot_for_dot? g->gimage->xresolution : monitor_xres)
|
||||
#define SCREEN_YRES(g) (g->dot_for_dot? g->gimage->yresolution : monitor_yres)
|
||||
|
||||
/* calculate scale factors (float) */
|
||||
#define SCALEFACTOR_X(g) ((SCALEDEST(g) * SCREEN_XRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->xresolution))
|
||||
#define SCALEFACTOR_Y(g) ((SCALEDEST(g) * SCREEN_YRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->yresolution))
|
||||
|
||||
/* scale values */
|
||||
#define SCALEX(g,x) ((int)(x * SCALEFACTOR_X(g)))
|
||||
#define SCALEY(g,y) ((int)(y * SCALEFACTOR_Y(g)))
|
||||
|
||||
/* unscale values */
|
||||
#define UNSCALEX(g,x) ((int)(x / SCALEFACTOR_X(g)))
|
||||
#define UNSCALEY(g,y) ((int)(y / SCALEFACTOR_Y(g)))
|
||||
|
||||
#define SCALE(g,x) ((x * SCALEDEST(g)) / SCALESRC(g))
|
||||
#define UNSCALE(g,x) ((x * SCALESRC(g)) / SCALEDEST(g))
|
||||
|
||||
|
|
@ -97,7 +78,6 @@ struct _GDisplay
|
|||
|
||||
int offset_x, offset_y; /* offset of display image into raw image */
|
||||
int scale; /* scale factor from original raw image */
|
||||
int dot_for_dot; /* is monitor resolution being ignored? */
|
||||
short draw_guides; /* should the guides be drawn? */
|
||||
short snap_to_guides; /* should the guides be snapped to? */
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -56,35 +56,6 @@ static GdkCursorType default_gdisplay_cursor = GDK_TOP_LEFT_ARROW;
|
|||
|
||||
#define MAX_TITLE_BUF 4096
|
||||
|
||||
/* some useful macros */
|
||||
|
||||
/* unpacking the user scale level (char) */
|
||||
#define SCALESRC(g) (g->scale & 0x00ff)
|
||||
#define SCALEDEST(g) (g->scale >> 8)
|
||||
|
||||
/* finding the effective screen resolution (float) */
|
||||
#define SCREEN_XRES(g) (g->dot_for_dot? g->gimage->xresolution : monitor_xres)
|
||||
#define SCREEN_YRES(g) (g->dot_for_dot? g->gimage->yresolution : monitor_yres)
|
||||
|
||||
/* calculate scale factors (float) */
|
||||
#define SCALEFACTOR_X(g) ((SCALEDEST(g) * SCREEN_XRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->xresolution))
|
||||
#define SCALEFACTOR_Y(g) ((SCALEDEST(g) * SCREEN_YRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->yresolution))
|
||||
|
||||
/* scale values */
|
||||
#define SCALEX(g,x) ((int)(x * SCALEFACTOR_X(g)))
|
||||
#define SCALEY(g,y) ((int)(y * SCALEFACTOR_Y(g)))
|
||||
|
||||
/* unscale values */
|
||||
#define UNSCALEX(g,x) ((int)(x / SCALEFACTOR_X(g)))
|
||||
#define UNSCALEY(g,y) ((int)(y / SCALEFACTOR_Y(g)))
|
||||
|
||||
|
||||
|
||||
#define LOWPASS(x) ((x>0) ? x : 0)
|
||||
/* #define HIGHPASS(x,y) ((x>y) ? y : x) */ /* unused - == MIN */
|
||||
|
||||
static char *image_type_strs[] =
|
||||
{
|
||||
"RGB",
|
||||
|
|
@ -231,7 +202,7 @@ gdisplay_delete (GDisplay *gdisp)
|
|||
|
||||
/* free the selection structure */
|
||||
selection_free (gdisp->select);
|
||||
|
||||
|
||||
if (gdisp->scroll_gc)
|
||||
gdk_gc_destroy (gdisp->scroll_gc);
|
||||
|
||||
|
|
|
|||
|
|
@ -31,25 +31,6 @@
|
|||
|
||||
#define SCALESRC(g) (g->scale & 0x00ff)
|
||||
#define SCALEDEST(g) (g->scale >> 8)
|
||||
|
||||
/* finding the effective screen resolution (float) */
|
||||
#define SCREEN_XRES(g) (g->dot_for_dot? g->gimage->xresolution : monitor_xres)
|
||||
#define SCREEN_YRES(g) (g->dot_for_dot? g->gimage->yresolution : monitor_yres)
|
||||
|
||||
/* calculate scale factors (float) */
|
||||
#define SCALEFACTOR_X(g) ((SCALEDEST(g) * SCREEN_XRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->xresolution))
|
||||
#define SCALEFACTOR_Y(g) ((SCALEDEST(g) * SCREEN_YRES(g)) / \
|
||||
(SCALESRC(g) * g->gimage->yresolution))
|
||||
|
||||
/* scale values */
|
||||
#define SCALEX(g,x) ((int)(x * SCALEFACTOR_X(g)))
|
||||
#define SCALEY(g,y) ((int)(y * SCALEFACTOR_Y(g)))
|
||||
|
||||
/* unscale values */
|
||||
#define UNSCALEX(g,x) ((int)(x / SCALEFACTOR_X(g)))
|
||||
#define UNSCALEY(g,y) ((int)(y / SCALEFACTOR_Y(g)))
|
||||
|
||||
#define SCALE(g,x) ((x * SCALEDEST(g)) / SCALESRC(g))
|
||||
#define UNSCALE(g,x) ((x * SCALESRC(g)) / SCALEDEST(g))
|
||||
|
||||
|
|
@ -97,7 +78,6 @@ struct _GDisplay
|
|||
|
||||
int offset_x, offset_y; /* offset of display image into raw image */
|
||||
int scale; /* scale factor from original raw image */
|
||||
int dot_for_dot; /* is monitor resolution being ignored? */
|
||||
short draw_guides; /* should the guides be drawn? */
|
||||
short snap_to_guides; /* should the guides be snapped to? */
|
||||
|
||||
|
|
|
|||
2086
app/image_render.c
2086
app/image_render.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue