diff --git a/ChangeLog b/ChangeLog index c767f4bd89..00d9d6e83f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 3 15:05:47 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (convert_to_format): Remove + bad optimization for src_rowstride == dest_stride. + (Didn't consider the case where we were copying only + partial widths of a wider source buffer) + (#113034, reported by Hans Petter Jansson) + 2003-06-03 Michael Natterer * gdk/x11/gdkinput-x11.c (_gdk_input_common_find_events): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c767f4bd89..00d9d6e83f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Jun 3 15:05:47 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (convert_to_format): Remove + bad optimization for src_rowstride == dest_stride. + (Didn't consider the case where we were copying only + partial widths of a wider source buffer) + (#113034, reported by Hans Petter Jansson) + 2003-06-03 Michael Natterer * gdk/x11/gdkinput-x11.c (_gdk_input_common_find_events): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c767f4bd89..00d9d6e83f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Jun 3 15:05:47 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (convert_to_format): Remove + bad optimization for src_rowstride == dest_stride. + (Didn't consider the case where we were copying only + partial widths of a wider source buffer) + (#113034, reported by Hans Petter Jansson) + 2003-06-03 Michael Natterer * gdk/x11/gdkinput-x11.c (_gdk_input_common_find_events): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c767f4bd89..00d9d6e83f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Jun 3 15:05:47 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (convert_to_format): Remove + bad optimization for src_rowstride == dest_stride. + (Didn't consider the case where we were copying only + partial widths of a wider source buffer) + (#113034, reported by Hans Petter Jansson) + 2003-06-03 Michael Natterer * gdk/x11/gdkinput-x11.c (_gdk_input_common_find_events): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c767f4bd89..00d9d6e83f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Jun 3 15:05:47 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (convert_to_format): Remove + bad optimization for src_rowstride == dest_stride. + (Didn't consider the case where we were copying only + partial widths of a wider source buffer) + (#113034, reported by Hans Petter Jansson) + 2003-06-03 Michael Natterer * gdk/x11/gdkinput-x11.c (_gdk_input_common_find_events): diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 779965bed9..70d563281e 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -1141,13 +1141,6 @@ convert_to_format (guchar *src_buf, { gint i; - if (dest_format == FORMAT_EXACT_MASK && - src_rowstride == dest_rowstride) - { - memcpy (dest_buf, src_buf, height * src_rowstride); - return; - } - for (i=0; i < height; i++) { switch (dest_format)