dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improved progress bar calculations. Still buggy though. 

2008-08-25  Sven Neumann  <sven@gimp.org>

	* app/paint-funcs/scale-region.c: improved progress bar
	calculations. Still buggy though.


svn path=/trunk/; revision=26750
This commit is contained in:
Sven Neumann 2008-08-25 07:42:49 +00:00 committed by Sven Neumann
parent 4ec451658c
commit 46ee36089c
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-08-25 Sven Neumann <sven@gimp.org>
* app/paint-funcs/scale-region.c: improved progress bar
calculations. Still buggy though.
2008-08-25 Sven Neumann <sven@gimp.org> 2008-08-25 Sven Neumann <sven@gimp.org>
* app/paint-funcs/scale-region.c: some more cleanups. * app/paint-funcs/scale-region.c: some more cleanups.

31
app/paint-funcs/scale-region.c
View File

@ -34,6 +34,10 @@
#include "scale-region.h" #include "scale-region.h"
#define NUM_TILES(w,h) ((((w) + (TILE_WIDTH - 1)) / TILE_WIDTH) * \
(((h) + (TILE_HEIGHT - 1)) / TILE_HEIGHT))
static void scale_region_buffer (PixelRegion *srcPR, static void scale_region_buffer (PixelRegion *srcPR,
PixelRegion *dstPR, PixelRegion *dstPR,
GimpInterpolationType interpolation, GimpInterpolationType interpolation,
@ -167,16 +171,15 @@ determine_scale (PixelRegion *srcPR,
gint width = srcPR->w; gint width = srcPR->w;
gint height = srcPR->h; gint height = srcPR->h;
*max_progress = ((height % TILE_HEIGHT) + 1) * ((width % TILE_WIDTH) + 1); *max_progress = NUM_TILES (dstPR->w, dstPR->h);
/* determine scaling levels */ /* determine scaling levels */
while (scalex > 2) while (scalex > 2)
{ {
scalex /= 2; scalex /= 2;
width *=2; width *= 2;
*levelx -= 1; *levelx -= 1;
*max_progress += (((height % TILE_HEIGHT) + 1) * *max_progress += NUM_TILES (width, height);
((width % TILE_WIDTH) + 1));
} }
while (scaley > 2) while (scaley > 2)
@ -184,8 +187,7 @@ determine_scale (PixelRegion *srcPR,
scaley /= 2; scaley /= 2;
height *= 2; height *= 2;
*levely -= 1; *levely -= 1;
*max_progress += (((height % TILE_HEIGHT) + 1) * *max_progress += NUM_TILES (width, height);
((width % TILE_WIDTH) + 1));
} }
while (scalex < 0.5) while (scalex < 0.5)
@ -193,8 +195,7 @@ determine_scale (PixelRegion *srcPR,
scalex *= 2; scalex *= 2;
width /= 2; width /= 2;
*levelx += 1; *levelx += 1;
*max_progress += (((height % TILE_HEIGHT) + 1) * *max_progress += NUM_TILES (width, height);
((width % TILE_WIDTH) + 1));
} }
while (scaley < 0.5) while (scaley < 0.5)
@ -202,8 +203,7 @@ determine_scale (PixelRegion *srcPR,
scaley *= 2; scaley *= 2;
height *= 2; height *= 2;
*levely += 1; *levely += 1;
*max_progress += (((height % TILE_HEIGHT) + 1) * *max_progress += NUM_TILES (width, height);
((width % TILE_WIDTH) + 1));
} }
} }
@ -361,8 +361,7 @@ scale_region_tile (PixelRegion *srcPR,
gint width = srcPR->w; gint width = srcPR->w;
gint height = srcPR->h; gint height = srcPR->h;
gint bytes = srcPR->bytes; gint bytes = srcPR->bytes;
gint max_progress = (((height % TILE_HEIGHT) + 1) * gint max_progress = 0;
((width % TILE_WIDTH) + 1));
gint progress = 0; gint progress = 0;
gint levelx = 0; gint levelx = 0;
gint levely = 0; gint levely = 0;
@ -372,9 +371,8 @@ scale_region_tile (PixelRegion *srcPR,
if (levelx == 0 && levely == 0) if (levelx == 0 && levely == 0)
{ {
scale (srcTM, dstTM, interpolation, scale (srcTM, dstTM, interpolation,
progress_callback, progress_callback, progress_data, &progress, max_progress);
progress_data, &progress, max_progress);
} }
while (levelx < 0 && levely < 0) while (levelx < 0 && levely < 0)
@ -474,8 +472,7 @@ scale_region_tile (PixelRegion *srcPR,
if (tmpTM != NULL) if (tmpTM != NULL)
{ {
scale (tmpTM, dstTM, interpolation, scale (tmpTM, dstTM, interpolation,
progress_callback, progress_callback, progress_data, &progress, max_progress);
progress_data, &progress, max_progress);
tile_manager_unref (tmpTM); tile_manager_unref (tmpTM);
} }