Minor fixes that were needed for the Gimp/GdkRgb integration.

ChangeLog

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

ChangeLog.pre-2-0

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

ChangeLog.pre-2-10

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

ChangeLog.pre-2-2

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

ChangeLog.pre-2-4

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

ChangeLog.pre-2-6

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

ChangeLog.pre-2-8

+1998-08-19  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkrgb.c: fixed some bugs in the 565_d mode, and added a
+	4bpp static_color mode (for vga displays). Also fixed a '64' value
+	in the dither matrix, which was causing one pixel out of 16k to be
+	dithered wrong.
+
+	* gtk/gtkpreview.{c,h}: Changed it to work with GdkRgb, gutting
+	most of the contents. This is an API change - any apps that relied
+	on the internal structure of GtkPreview will need some change -
+	most notably in the use of reserved colors. The Gimp needed
+	changes in this regard.
+
 Wed Aug 19 00:11:14 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkmain.c (gtk_init): allow argument parsing in gtk without

gtk/gtkpreview.h

@@ -46,6 +46,11 @@ struct _GtkPreview
   guint16 buffer_width;
   guint16 buffer_height;
 
+  guint16 bpp;
+  guint16 rowstride;
+
+  GdkRgbDither dither;
+
   guint type : 1;
   guint expand : 1;
 };
@@ -55,28 +60,8 @@ struct _GtkPreviewInfo
   GdkVisual *visual;
   GdkColormap *cmap;
 
-  gulong *color_pixels;
-  gulong *gray_pixels;
-  gulong *reserved_pixels;
-
-  gulong *lookup_red;
-  gulong *lookup_green;
-  gulong *lookup_blue;
-
-  GtkDitherInfo *dither_red;
-  GtkDitherInfo *dither_green;
-  GtkDitherInfo *dither_blue;
-  GtkDitherInfo *dither_gray;
-  guchar ***dither_matrix;
-
-  guint nred_shades;
-  guint ngreen_shades;
-  guint nblue_shades;
-  guint ngray_shades;
-  guint nreserved;
+  guchar *lookup;
 
-  guint bpp;
-  gint cmap_alloced;
   gdouble gamma;
 };
 
@@ -92,7 +77,6 @@ struct _GtkPreviewClass
 
   GtkPreviewInfo info;
 
-  GdkImage *image;
 };
 
 
@@ -111,6 +95,7 @@ void            gtk_preview_put                (GtkPreview      *preview,
 						gint             desty,
 						gint             width,
 						gint             height);
+/* gtk_preview_put_row is broken */
 void            gtk_preview_put_row            (GtkPreview      *preview,
 						guchar          *src,
 						guchar          *dest,
@@ -132,6 +117,8 @@ void            gtk_preview_set_color_cube     (guint            nred_shades,
 						guint            ngray_shades);
 void            gtk_preview_set_install_cmap   (gint             install_cmap);
 void            gtk_preview_set_reserved       (gint             nreserved);
+void            gtk_preview_set_dither         (GtkPreview      *preview,
+						GdkRgbDither     dither);
 GdkVisual*      gtk_preview_get_visual         (void);
 GdkColormap*    gtk_preview_get_cmap           (void);
 GtkPreviewInfo* gtk_preview_get_info           (void);