Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
G
gtk
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dorota Czaplejewicz
gtk
Commits
241ff0b6
Commit
241ff0b6
authored
Oct 08, 2006
by
Matthias Clasen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanups
parent
07e77194
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
51 additions
and
82 deletions
+51
-82
ChangeLog
ChangeLog
+7
-0
contrib/gdk-pixbuf-xlib/ChangeLog
contrib/gdk-pixbuf-xlib/ChangeLog
+5
-0
gdk-pixbuf/ChangeLog
gdk-pixbuf/ChangeLog
+4
-0
gdk-pixbuf/gdk-pixbuf-io.c
gdk-pixbuf/gdk-pixbuf-io.c
+2
-2
gdk-pixbuf/gdk-pixdata.c
gdk-pixbuf/gdk-pixdata.c
+5
-29
gdk-pixbuf/io-jpeg.c
gdk-pixbuf/io-jpeg.c
+0
-2
gdk-pixbuf/io-pcx.c
gdk-pixbuf/io-pcx.c
+4
-6
gdk-pixbuf/io-png.c
gdk-pixbuf/io-png.c
+1
-1
gdk-pixbuf/io-pnm.c
gdk-pixbuf/io-pnm.c
+1
-7
gdk-pixbuf/io-tiff.c
gdk-pixbuf/io-tiff.c
+1
-5
gdk-pixbuf/io-wbmp.c
gdk-pixbuf/io-wbmp.c
+1
-1
gdk-pixbuf/pixops/timescale.c
gdk-pixbuf/pixops/timescale.c
+5
-4
gdk-pixbuf/queryloaders.c
gdk-pixbuf/queryloaders.c
+1
-1
gdk/gdkgc.c
gdk/gdkgc.c
+0
-1
gdk/gdkregion-generic.c
gdk/gdkregion-generic.c
+1
-1
gdk/gdkrgb.c
gdk/gdkrgb.c
+1
-1
gdk/gdkwindow.c
gdk/gdkwindow.c
+0
-1
gdk/x11/gdkdnd-x11.c
gdk/x11/gdkdnd-x11.c
+1
-1
gdk/x11/gdkim-x11.c
gdk/x11/gdkim-x11.c
+0
-1
gdk/x11/gdkwindow-x11.c
gdk/x11/gdkwindow-x11.c
+0
-2
gtk/gtkradiobutton.c
gtk/gtkradiobutton.c
+2
-2
gtk/gtksocket-x11.c
gtk/gtksocket-x11.c
+0
-1
modules/engines/pixbuf/ChangeLog
modules/engines/pixbuf/ChangeLog
+5
-0
modules/engines/pixbuf/pixbuf-draw.c
modules/engines/pixbuf/pixbuf-draw.c
+2
-11
modules/input/gtkimcontextxim.c
modules/input/gtkimcontextxim.c
+1
-1
perf/gtkwidgetprofiler.h
perf/gtkwidgetprofiler.h
+1
-1
No files found.
ChangeLog
View file @
241ff0b6
2006-10-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't
leak a list. (#360350, Benjamin Berg)
* Apply a cleanup patch by Kjartan Maraas (#341812)
2006-10-07 Tor Lillqvist <tml@novell.com>
* gtk/gtkcalendar.c (gtk_calendar_init): Use the Win32 thread
...
...
contrib/gdk-pixbuf-xlib/ChangeLog
View file @
241ff0b6
2006-10-08 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-xlib.c: Apply a cleanup patch by
Kjartan Maraas (#341812)
2006-08-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.10.2 ===
...
...
gdk-pixbuf/ChangeLog
View file @
241ff0b6
2006
-
10
-
08
Matthias
Clasen
<
mclasen
@
redhat
.
com
>
*
Apply
a
cleanup
patch
by
Kjartan
Maraas
(#
341812
)
2006
-
09
-
06
Matthias
Clasen
<
mclasen
@
redhat
.
com
>
*
io
-
pnm
.
c
:
Simplify
and
fix
reading
of
ASCII
images
.
...
...
gdk-pixbuf/gdk-pixbuf-io.c
View file @
241ff0b6
...
...
@@ -123,7 +123,7 @@ _gdk_pixbuf_unlock (GdkPixbufModule *image_module)
static
GSList
*
file_formats
=
NULL
;
static
void
gdk_pixbuf_io_init
();
static
void
gdk_pixbuf_io_init
(
void
);
static
GSList
*
get_file_formats
(
void
)
...
...
@@ -1138,7 +1138,7 @@ gdk_pixbuf_new_from_file_at_scale (const char *filename,
animation
=
gdk_pixbuf_loader_get_animation
(
loader
);
if
(
animation
)
{
iter
=
gdk_pixbuf_animation_get_iter
(
animation
,
0
);
iter
=
gdk_pixbuf_animation_get_iter
(
animation
,
NULL
);
if
(
!
gdk_pixbuf_animation_iter_on_currently_loading_frame
(
iter
))
{
has_frame
=
TRUE
;
}
...
...
gdk-pixbuf/gdk-pixdata.c
View file @
241ff0b6
...
...
@@ -620,7 +620,7 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata,
GdkPixdataDumpType
dump_type
)
{
CSourceData
cdata
=
{
0
,
};
gchar
*
s_uint_8
,
*
s_uint_32
,
*
s_uint
,
*
s_char
,
*
s_null
;
gchar
*
s_uint_8
;
guint
bpp
,
width
,
height
,
rowstride
;
gboolean
rle_encoded
;
gchar
*
macro_name
;
...
...
@@ -670,37 +670,13 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata,
cdata
.
gstring
=
gstring
;
if
(
!
cdata
.
dump_macros
&&
cdata
.
dump_gtypes
)
{
s_uint_8
=
"guint8 "
;
s_uint_32
=
"guint32"
;
s_uint
=
"guint "
;
s_char
=
"gchar "
;
s_null
=
"NULL"
;
}
s_uint_8
=
"guint8 "
;
else
if
(
!
cdata
.
dump_macros
)
{
s_uint_8
=
"unsigned char"
;
s_uint_32
=
"unsigned int "
;
s_uint
=
"unsigned int "
;
s_char
=
"char "
;
s_null
=
"(char*) 0"
;
}
s_uint_8
=
"unsigned char"
;
else
if
(
cdata
.
dump_macros
&&
cdata
.
dump_gtypes
)
{
s_uint_8
=
"guint8"
;
s_uint_32
=
"guint32"
;
s_uint
=
"guint"
;
s_char
=
"gchar"
;
s_null
=
"NULL"
;
}
s_uint_8
=
"guint8"
;
else
/* cdata.dump_macros && !cdata.dump_gtypes */
{
s_uint_8
=
"unsigned char"
;
s_uint_32
=
"unsigned int"
;
s_uint
=
"unsigned int"
;
s_char
=
"char"
;
s_null
=
"(char*) 0"
;
}
s_uint_8
=
"unsigned char"
;
/* initial comment
*/
...
...
gdk-pixbuf/io-jpeg.c
View file @
241ff0b6
...
...
@@ -808,8 +808,6 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data,
continue
;
}
}
return
TRUE
;
}
/* Save */
...
...
gdk-pixbuf/io-pcx.c
View file @
241ff0b6
...
...
@@ -236,14 +236,12 @@ pcx_chop_context_buf(struct pcx_context *context, guint size)
{
guint
i
,
j
;
if
(
size
>
context
->
buf_pos
)
if
(
size
>
context
->
buf_pos
)
return
FALSE
;
else
if
(
size
<
0
)
return
FALSE
;
else
if
(
size
==
0
)
else
if
(
size
==
0
)
return
TRUE
;
for
(
i
=
0
,
j
=
size
;
j
<
context
->
buf_pos
;
i
++
,
j
++
)
for
(
i
=
0
,
j
=
size
;
j
<
context
->
buf_pos
;
i
++
,
j
++
)
context
->
buf
[
i
]
=
context
->
buf
[
j
];
context
->
buf_pos
-=
size
;
...
...
@@ -629,7 +627,7 @@ gdk_pixbuf__pcx_load_increment(gpointer data, const guchar *buf, guint size,
case
4
:
case
8
:
if
(
context
->
num_planes
!=
1
)
{
g_set_error
(
error
,
GDK_PIXBUF_ERROR
,
GDK_PIXBUF_ERROR_UNKNOWN_TYPE
,
_
(
"Image has unsupported number of %d-bit planes"
),
context
->
bpp
);
g_set_error
(
error
,
GDK_PIXBUF_ERROR
,
GDK_PIXBUF_ERROR_UNKNOWN_TYPE
,
_
(
"Image has unsupported number of %d-bit planes"
),
(
gint
)
context
->
bpp
);
return
FALSE
;
}
break
;
...
...
gdk-pixbuf/io-png.c
View file @
241ff0b6
...
...
@@ -660,7 +660,7 @@ png_row_callback (png_structp png_read_ptr,
if
(
lc
->
fatal_error_occurred
)
return
;
if
(
row_num
<
0
||
row_num
>=
lc
->
pixbuf
->
height
)
{
if
(
row_num
>=
lc
->
pixbuf
->
height
)
{
lc
->
fatal_error_occurred
=
TRUE
;
if
(
lc
->
error
&&
*
lc
->
error
==
NULL
)
{
g_set_error
(
lc
->
error
,
...
...
gdk-pixbuf/io-pnm.c
View file @
241ff0b6
...
...
@@ -108,19 +108,17 @@ explode_bitmap_into_buf (PnmLoaderContext *context)
guchar
*
from
,
*
to
,
data
;
gint
bit
;
guchar
*
dptr
;
gint
wid
,
x
,
y
;
gint
wid
,
x
;
g_return_if_fail
(
context
!=
NULL
);
g_return_if_fail
(
context
->
dptr
!=
NULL
);
/* I'm no clever bit-hacker so I'm sure this can be optimized */
dptr
=
context
->
dptr
;
y
=
context
->
output_row
;
wid
=
context
->
width
;
from
=
dptr
+
((
wid
-
1
)
/
8
);
to
=
dptr
+
(
wid
-
1
)
*
3
;
/* bit = 7 - (((y+1)*wid-1) % 8); */
bit
=
7
-
((
wid
-
1
)
%
8
);
/* get first byte and align properly */
...
...
@@ -892,8 +890,6 @@ gdk_pixbuf__pnm_image_load_increment (gpointer data,
{
PnmLoaderContext
*
context
=
(
PnmLoaderContext
*
)
data
;
PnmIOBuffer
*
inbuf
;
guchar
*
old_byte
;
guint
old_nbytes
;
const
guchar
*
bufhd
;
guint
num_left
,
spinguard
;
gint
retval
;
...
...
@@ -905,8 +901,6 @@ gdk_pixbuf__pnm_image_load_increment (gpointer data,
bufhd
=
buf
;
inbuf
=
&
context
->
inbuf
;
old_nbytes
=
inbuf
->
nbytes
;
old_byte
=
inbuf
->
byte
;
num_left
=
size
;
spinguard
=
0
;
...
...
gdk-pixbuf/io-tiff.c
View file @
241ff0b6
...
...
@@ -430,7 +430,7 @@ tiff_load_seek (thandle_t handle, toff_t offset, int whence)
switch
(
whence
)
{
case
SEEK_SET
:
if
(
offset
>
context
->
used
||
offset
<
0
)
if
(
offset
>
context
->
used
)
return
-
1
;
context
->
pos
=
offset
;
break
;
...
...
@@ -446,7 +446,6 @@ tiff_load_seek (thandle_t handle, toff_t offset, int whence)
break
;
default:
return
-
1
;
break
;
}
return
context
->
pos
;
}
...
...
@@ -622,8 +621,6 @@ tiff_save_seek (thandle_t handle, toff_t offset, int whence)
switch
(
whence
)
{
case
SEEK_SET
:
if
(
offset
<
0
)
return
-
1
;
context
->
pos
=
offset
;
break
;
case
SEEK_CUR
:
...
...
@@ -634,7 +631,6 @@ tiff_save_seek (thandle_t handle, toff_t offset, int whence)
break
;
default:
return
-
1
;
break
;
}
return
context
->
pos
;
}
...
...
gdk-pixbuf/io-wbmp.c
View file @
241ff0b6
...
...
@@ -166,7 +166,7 @@ static gboolean
get_mbi
(
struct
wbmp_progressive_state
*
context
,
const
guchar
**
buf
,
guint
*
buf_size
,
int
*
val
)
{
guchar
intbuf
[
16
];
int
i
,
n
;
int
n
;
gboolean
rv
;
*
val
=
0
;
...
...
gdk-pixbuf/pixops/timescale.c
View file @
241ff0b6
...
...
@@ -26,12 +26,13 @@
static
GTimeVal
start_time
;
void
start_timing
(
void
)
static
void
start_timing
(
void
)
{
g_get_current_time
(
&
start_time
);
}
double
static
double
stop_timing
(
const
char
*
test
,
int
iterations
,
int
bytes
)
{
GTimeVal
stop_time
;
...
...
@@ -53,7 +54,7 @@ stop_timing (const char *test, int iterations, int bytes)
return
((
double
)
bytes
*
iterations
)
/
(
1000
*
msecs
);
}
void
static
void
init_array
(
double
times
[
3
][
3
][
4
])
{
int
i
,
j
,
k
;
...
...
@@ -64,7 +65,7 @@ init_array (double times[3][3][4])
times
[
i
][
j
][
k
]
=
-
1
;
}
void
static
void
dump_array
(
double
times
[
3
][
3
][
4
])
{
int
i
,
j
;
...
...
gdk-pixbuf/queryloaders.c
View file @
241ff0b6
...
...
@@ -38,7 +38,7 @@
#include "gdk-pixbuf/gdk-pixbuf-private.h"
#include "gdk-pixbuf/gdk-pixbuf-io.h"
#if USE_LA_MODULES
#if
def
USE_LA_MODULES
#define SOEXT ".la"
#else
#define SOEXT ("." G_MODULE_SUFFIX)
...
...
gdk/gdkgc.c
View file @
241ff0b6
...
...
@@ -279,7 +279,6 @@ gdk_gc_set_values (GdkGC *gc,
gc
->
ts_y_origin
=
values
->
ts_y_origin
;
if
(
values_mask
&
GDK_GC_CLIP_MASK
)
{
GdkGCPrivate
*
priv
=
GDK_GC_GET_PRIVATE
(
gc
);
if
(
priv
->
clip_region
)
{
gdk_region_destroy
(
priv
->
clip_region
);
...
...
gdk/gdkregion-generic.c
View file @
241ff0b6
...
...
@@ -105,7 +105,7 @@ static void miRegionOp (GdkRegion *newReg,
* Returns: a new empty #GdkRegion
*/
GdkRegion
*
gdk_region_new
()
gdk_region_new
(
void
)
{
GdkRegion
*
temp
;
...
...
gdk/gdkrgb.c
View file @
241ff0b6
...
...
@@ -485,7 +485,7 @@ gdk_rgb_set_gray_cmap (GdkRgbInfo *image_info,
{
gint
i
;
GdkColor
color
;
g
int
status
;
g
boolean
status
;
gulong
pixels
[
256
];
gint
r
,
g
,
b
,
gray
;
...
...
gdk/gdkwindow.c
View file @
241ff0b6
...
...
@@ -30,7 +30,6 @@
#include "gdk.h"
/* For gdk_rectangle_union() */
#include "gdkpixmap.h"
#include "gdkdrawable.h"
#include "gdkpixmap.h"
#include "gdkscreen.h"
#include "gdkalias.h"
...
...
gdk/x11/gdkdnd-x11.c
View file @
241ff0b6
...
...
@@ -130,7 +130,7 @@ static void gdk_drag_context_finalize (GObject *object);
static
GList
*
contexts
;
const
static
struct
{
static
const
struct
{
const
char
*
atom_name
;
GdkFilterFunc
func
;
}
xdnd_filters
[]
=
{
...
...
gdk/x11/gdkim-x11.c
View file @
241ff0b6
...
...
@@ -32,7 +32,6 @@
#include "gdkx.h"
#include "gdk.h"
/* For gdk_flush() */
#include "gdkx.h"
#include "gdkpixmap.h"
#include "gdkinternals.h"
#include "gdkdisplay-x11.h"
...
...
gdk/x11/gdkwindow-x11.c
View file @
241ff0b6
...
...
@@ -1577,7 +1577,6 @@ gdk_window_hide (GdkWindow *window)
case
GDK_WINDOW_TEMP
:
/* ? */
gdk_window_withdraw
(
window
);
return
;
break
;
case
GDK_WINDOW_FOREIGN
:
case
GDK_WINDOW_ROOT
:
...
...
@@ -5737,7 +5736,6 @@ wmspec_resize_drag (GdkWindow *window,
g_warning
(
"gdk_window_begin_resize_drag: bad resize edge %d!"
,
edge
);
return
;
break
;
}
wmspec_moveresize
(
window
,
direction
,
root_x
,
root_y
,
timestamp
);
...
...
gtk/gtkradiobutton.c
View file @
241ff0b6
...
...
@@ -449,8 +449,6 @@ gtk_radio_button_focus (GtkWidget *widget,
GtkWidget
*
toplevel
=
gtk_widget_get_toplevel
(
widget
);
GtkWidget
*
new_focus
=
NULL
;
focus_list
=
g_slist_copy
(
radio_button
->
group
);
switch
(
direction
)
{
case
GTK_DIR_TAB_FORWARD
:
...
...
@@ -458,10 +456,12 @@ gtk_radio_button_focus (GtkWidget *widget,
return
FALSE
;
case
GTK_DIR_LEFT
:
case
GTK_DIR_RIGHT
:
focus_list
=
g_slist_copy
(
radio_button
->
group
);
focus_list
=
g_slist_sort_with_data
(
focus_list
,
left_right_compare
,
toplevel
);
break
;
case
GTK_DIR_UP
:
case
GTK_DIR_DOWN
:
focus_list
=
g_slist_copy
(
radio_button
->
group
);
focus_list
=
g_slist_sort_with_data
(
focus_list
,
up_down_compare
,
toplevel
);
break
;
}
...
...
gtk/gtksocket-x11.c
View file @
241ff0b6
...
...
@@ -29,7 +29,6 @@
#include <string.h>
#include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkwindow.h"
...
...
modules/engines/pixbuf/ChangeLog
View file @
241ff0b6
2006-10-08 Matthias Clasen <mclasen@redhat.com>
* pixbuf-draw.c: Apply a cleanup patch by
Kjartan Maraas (#341812)
2006-08-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.10.2 ===
...
...
modules/engines/pixbuf/pixbuf-draw.c
View file @
241ff0b6
...
...
@@ -109,14 +109,9 @@ draw_simple_image(GtkStyle *style,
gint
height
)
{
ThemeImage
*
image
;
gboolean
setbg
=
FALSE
;
if
((
width
==
-
1
)
&&
(
height
==
-
1
))
{
gdk_drawable_get_size
(
window
,
&
width
,
&
height
);
if
(
allow_setbg
)
setbg
=
TRUE
;
}
gdk_drawable_get_size
(
window
,
&
width
,
&
height
);
else
if
(
width
==
-
1
)
gdk_drawable_get_size
(
window
,
&
width
,
NULL
);
else
if
(
height
==
-
1
)
...
...
@@ -172,13 +167,9 @@ draw_gap_image(GtkStyle *style,
gint
gap_width
)
{
ThemeImage
*
image
;
gboolean
setbg
=
FALSE
;
if
((
width
==
-
1
)
&&
(
height
==
-
1
))
{
gdk_drawable_get_size
(
window
,
&
width
,
&
height
);
setbg
=
TRUE
;
}
gdk_drawable_get_size
(
window
,
&
width
,
&
height
);
else
if
(
width
==
-
1
)
gdk_drawable_get_size
(
window
,
&
width
,
NULL
);
else
if
(
height
==
-
1
)
...
...
modules/input/gtkimcontextxim.c
View file @
241ff0b6
...
...
@@ -147,7 +147,7 @@ static GObjectClass *parent_class;
GType
gtk_type_im_context_xim
=
0
;
GSList
*
open_ims
=
NULL
;
static
GSList
*
open_ims
=
NULL
;
/* List of status windows for different toplevels */
static
GSList
*
status_windows
=
NULL
;
...
...
perf/gtkwidgetprofiler.h
View file @
241ff0b6
...
...
@@ -45,7 +45,7 @@ struct _GtkWidgetProfilerClass {
GType
gtk_widget_profiler_get_type
(
void
)
G_GNUC_CONST
;
GtkWidgetProfiler
*
gtk_widget_profiler_new
();
GtkWidgetProfiler
*
gtk_widget_profiler_new
(
void
);
void
gtk_widget_profiler_set_num_iterations
(
GtkWidgetProfiler
*
profiler
,
gint
n_iterations
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment