callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed GIMP_RENDER_BUF_WIDTH and GIMP_RENDER_BUF_HEIGHT definitions.

Browse Source 
2007-12-28  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimprender.h: removed GIMP_RENDER_BUF_WIDTH and
	GIMP_RENDER_BUF_HEIGHT definitions.

	* app/display/gimpdisplayshell.h: define the size of the display
	render buffer here.

	* app/display/gimpdisplayshell.c
	* app/display/gimpdisplayshell-draw.c
	* app/widgets/gimprender.c: changed accordingly.


svn path=/trunk/; revision=24456
This commit is contained in:
Sven Neumann
2007-12-28 22:12:17 +00:00
committed by Sven Neumann
parent 787b01005d
commit 3d48f1bcc9
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2007-12-28 Sven Neumann <sven@gimp.org>
* app/widgets/gimprender.h: removed GIMP_RENDER_BUF_WIDTH and
GIMP_RENDER_BUF_HEIGHT definitions.
* app/display/gimpdisplayshell.h: define the size of the display
render buffer here.
* app/display/gimpdisplayshell.c
* app/display/gimpdisplayshell-draw.c
* app/widgets/gimprender.c: changed accordingly.
2007-12-28 Sven Neumann <sven@gimp.org> 2007-12-28 Sven Neumann <sven@gimp.org>
* app/widgets/gimpcolormapeditor.c: don't use the render buffer. * app/widgets/gimpcolormapeditor.c: don't use the render buffer.

9
app/display/gimpdisplayshell-draw.c
View File

@ -40,7 +40,6 @@
#include "vectors/gimpstroke.h" #include "vectors/gimpstroke.h"
#include "vectors/gimpvectors.h" #include "vectors/gimpvectors.h"
#include "widgets/gimprender.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
#include "gimpcanvas.h" #include "gimpcanvas.h"
@ -564,14 +563,14 @@ gimp_display_shell_draw_area (GimpDisplayShell *shell,
/* display the image in RENDER_BUF_WIDTH x RENDER_BUF_HEIGHT /* display the image in RENDER_BUF_WIDTH x RENDER_BUF_HEIGHT
* sized chunks * sized chunks
*/ */
for (i = y; i < y2; i += GIMP_RENDER_BUF_HEIGHT) for (i = y; i < y2; i += GIMP_DISPLAY_RENDER_BUF_HEIGHT)
{ {
for (j = x; j < x2; j += GIMP_RENDER_BUF_WIDTH) for (j = x; j < x2; j += GIMP_DISPLAY_RENDER_BUF_WIDTH)
{ {
gint dx, dy; gint dx, dy;
dx = MIN (x2 - j, GIMP_RENDER_BUF_WIDTH); dx = MIN (x2 - j, GIMP_DISPLAY_RENDER_BUF_WIDTH);
dy = MIN (y2 - i, GIMP_RENDER_BUF_HEIGHT); dy = MIN (y2 - i, GIMP_DISPLAY_RENDER_BUF_HEIGHT);
gimp_display_shell_render (shell, gimp_display_shell_render (shell,
j - shell->disp_xoffset, j - shell->disp_xoffset,

5
app/display/gimpdisplayshell.c
View File

@ -46,7 +46,6 @@
#include "core/gimpmarshal.h" #include "core/gimpmarshal.h"
#include "core/gimpsamplepoint.h" #include "core/gimpsamplepoint.h"
#include "widgets/gimprender.h"
#include "widgets/gimphelp-ids.h" #include "widgets/gimphelp-ids.h"
#include "widgets/gimpmenufactory.h" #include "widgets/gimpmenufactory.h"
#include "widgets/gimpuimanager.h" #include "widgets/gimpuimanager.h"
@ -278,8 +277,8 @@ gimp_display_shell_init (GimpDisplayShell *shell)
shell->statusbar = NULL; shell->statusbar = NULL;
shell->render_buf = g_new (guchar, shell->render_buf = g_new (guchar,
GIMP_RENDER_BUF_WIDTH * GIMP_DISPLAY_RENDER_BUF_WIDTH *
GIMP_RENDER_BUF_HEIGHT * 3); GIMP_DISPLAY_RENDER_BUF_HEIGHT * 3);
shell->title_idle_id = 0; shell->title_idle_id = 0;

4
app/display/gimpdisplayshell.h
View File

@ -46,6 +46,10 @@
#define FUNSCALEX(s,x) ((x) / (s)->scale_x) #define FUNSCALEX(s,x) ((x) / (s)->scale_x)
#define FUNSCALEY(s,y) ((y) / (s)->scale_y) #define FUNSCALEY(s,y) ((y) / (s)->scale_y)
/* the size of the display render buffer */
#define GIMP_DISPLAY_RENDER_BUF_WIDTH 256
#define GIMP_DISPLAY_RENDER_BUF_HEIGHT 256
#define GIMP_TYPE_DISPLAY_SHELL (gimp_display_shell_get_type ()) #define GIMP_TYPE_DISPLAY_SHELL (gimp_display_shell_get_type ())
#define GIMP_DISPLAY_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_SHELL, GimpDisplayShell)) #define GIMP_DISPLAY_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DISPLAY_SHELL, GimpDisplayShell))

3
app/widgets/gimprender.c
View File

@ -168,8 +168,7 @@ gimp_render_setup_notify (gpointer config,
g_free (gimp_render_empty_buf); g_free (gimp_render_empty_buf);
g_free (gimp_render_white_buf); g_free (gimp_render_white_buf);
#define BUF_SIZE (MAX (GIMP_RENDER_BUF_WIDTH, \ #define BUF_SIZE (GIMP_VIEWABLE_MAX_PREVIEW_SIZE + 4)
GIMP_VIEWABLE_MAX_PREVIEW_SIZE) + 4)
gimp_render_check_buf = g_new (guchar, BUF_SIZE * 3); gimp_render_check_buf = g_new (guchar, BUF_SIZE * 3);
gimp_render_empty_buf = g_new0 (guchar, BUF_SIZE * 3); gimp_render_empty_buf = g_new0 (guchar, BUF_SIZE * 3);

3
app/widgets/gimprender.h
View File

@ -20,9 +20,6 @@
#define __GIMP_RENDER_H__ #define __GIMP_RENDER_H__
#define GIMP_RENDER_BUF_WIDTH 256
#define GIMP_RENDER_BUF_HEIGHT 256
/* buffers that contain pre-rendered patterns/colors */ /* buffers that contain pre-rendered patterns/colors */
extern guchar *gimp_render_check_buf; extern guchar *gimp_render_check_buf;
extern guchar *gimp_render_empty_buf; extern guchar *gimp_render_empty_buf;