Commit ed707bea authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/edit_selection.c app/gimpimage.c app/layer_select.c when computing a

2000-12-11  Sven Neumann  <sven@gimp.org>

	* app/edit_selection.c
	* app/gimpimage.c
	* app/layer_select.c
	* app/layers_dialog.c: when computing a preview, limit the scale ratio
	to a maximum of 1.0. By doing so we avoid to scale drawables up if the
	image (canvas) size becomes larger than the drawable. Fixes bug #31098.

	* app/gimppreviewcache.[ch]: indented
parent b55be14f
2000-12-11 Sven Neumann <sven@gimp.org>
* app/edit_selection.c
* app/gimpimage.c
* app/layer_select.c
* app/layers_dialog.c: when computing a preview, limit the scale ratio
to a maximum of 1.0. By doing so we avoid to scale drawables up if the
image (canvas) size becomes larger than the drawable. Fixes bug #31098.
* app/gimppreviewcache.[ch]: indented
2000-12-11 Michael Natterer <mitch@gimp.org>
 
* configure.in: forgot to bump gimp-print's version number and
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -16,40 +16,60 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <string.h>
#include "gimpdrawableP.h"
#include "gimage.h"
#include "temp_buf.h"
#include "config.h"
#include <glib.h>
#include "gimppreviewcache.h"
#define MAX_CACHE_PREVIEWS 5
#undef PREVIEW_CACHE_DEBUG
typedef struct _PreviewCache
{
TempBuf *preview;
gint width;
gint height;
} PreviewCache;
typedef struct _PreviewNearest
{
PreviewCache *pc;
gint width;
gint height;
} PreviewNearest;
static gint
preview_cache_compare(gconstpointer a,
gconstpointer b)
preview_cache_compare (gconstpointer a,
gconstpointer b)
{
PreviewCache *pc1 = (PreviewCache *)a;
PreviewCache *pc2 = (PreviewCache *)b;
PreviewCache *pc1 = (PreviewCache *) a;
PreviewCache *pc2 = (PreviewCache *) b;
if(pc1->width > pc2->width && pc1->height > pc2->height)
if (pc1->width > pc2->width && pc1->height > pc2->height)
return -1;
return 1;
}
static void
preview_cache_find_exact(gpointer data, gpointer udata)
preview_cache_find_exact (gpointer data,
gpointer udata)
{
PreviewCache *pc = (PreviewCache *)data;
PreviewNearest *pNearest = (PreviewNearest *)udata;
PreviewCache *pc = (PreviewCache *) data;
PreviewNearest *pNearest = (PreviewNearest *) udata;
/* printf("this value w,h [%d,%d]\n",pc->width,pc->height); */
/* g_print ("this value w,h [%d,%d]\n",pc->width,pc->height); */
/* if(pNearest->pc) */
/* printf("current nearest value w,h [%d,%d]\n",pNearest->pc->width,pNearest->pc->height); */
/* if (pNearest->pc) */
/* g_print ("current nearest value w,h [%d,%d]\n",
pNearest->pc->width,pNearest->pc->height); */
if(pNearest->pc)
if (pNearest->pc)
return;
if(pc->width == pNearest->width &&
......@@ -59,31 +79,34 @@ preview_cache_find_exact(gpointer data, gpointer udata)
* If we already have it are these bigger dimensions?
*/
pNearest->pc = pc;
return;
}
}
static void
preview_cache_find_biggest(gpointer data, gpointer udata)
preview_cache_find_biggest (gpointer data,
gpointer udata)
{
PreviewCache *pc = (PreviewCache *)data;
PreviewNearest *pNearest = (PreviewNearest *)udata;
PreviewCache *pc = (PreviewCache *) data;
PreviewNearest *pNearest = (PreviewNearest *) udata;
/* printf("this value w,h [%d,%d]\n",pc->width,pc->height); */
/* g_print ("this value w,h [%d,%d]\n",pc->width,pc->height); */
/* if(pNearest->pc) */
/* printf("current nearest value w,h [%d,%d]\n",pNearest->pc->width,pNearest->pc->height); */
/* if (pNearest->pc) */
/* g_print ("current nearest value w,h [%d,%d]\n",
pNearest->pc->width,pNearest->pc->height); */
if(pc->width >= pNearest->width &&
pc->height >= pNearest->height)
if (pc->width >= pNearest->width &&
pc->height >= pNearest->height)
{
/* Ok we could make the preview out of this one...
* If we already have it are these bigger dimensions?
*/
if(pNearest->pc)
if (pNearest->pc)
{
if(pNearest->pc->width > pc->width &&
pNearest->pc->height > pc->height)
if (pNearest->pc->width > pc->width &&
pNearest->pc->height > pc->height)
return;
}
pNearest->pc = pc;
......@@ -91,82 +114,91 @@ preview_cache_find_biggest(gpointer data, gpointer udata)
}
static void
preview_cache_remove_smallest(GSList **plist)
preview_cache_remove_smallest (GSList **plist)
{
GSList *cur = *plist;
GSList *list;
PreviewCache *smallest = NULL;
/* printf("Removing smallest\n"); */
if(!cur)
return;
/* g_print ("Removing smallest\n"); */
do
for (list = *plist; list; list = g_slist_next (list))
{
if(!smallest)
if (!smallest)
{
smallest = cur->data;
/* printf("init smallest %d,%d\n",smallest->width,smallest->height); */
smallest = list->data;
/* g_print ("init smallest %d,%d\n",
smallest->width,smallest->height); */
}
else
{
PreviewCache *pcthis = cur->data;
/* printf("Checking %d,%d\n",pcthis->width,pcthis->height); */
if((smallest->height*smallest->width) >=
(pcthis->height*pcthis->width))
PreviewCache *pcthis = list->data;
/* g_print ("Checking %d,%d\n",pcthis->width,pcthis->height); */
if ((smallest->height * smallest->width) >=
(pcthis->height * pcthis->width))
{
smallest = pcthis;
/* printf("smallest now %d,%d\n",smallest->width,smallest->height); */
/* g_print ("smallest now %d,%d\n",
smallest->width,smallest->height); */
}
}
} while((cur = g_slist_next(cur)));
}
*plist = g_slist_remove(*plist,smallest);
/* printf("removed %d,%d\n",smallest->width,smallest->height); */
/* printf("removed smallest\n"); */
if (*plist && smallest)
*plist = g_slist_remove (*plist, smallest);
/* g_print ("removed %d,%d\n",smallest->width,smallest->height); */
/* g_print ("removed smallest\n"); */
}
static void
preview_cache_invalidate(gpointer data, gpointer udata)
preview_cache_invalidate (gpointer data,
gpointer udata)
{
PreviewCache *pc = (PreviewCache *)data;
PreviewCache *pc = (PreviewCache *) data;
temp_buf_free (pc->preview);
g_free(pc);
}
static void
preview_cache_print(gpointer data, gpointer udata)
preview_cache_print (GSList *plist)
{
/* PreviewCache *pc = (PreviewCache *)data; */
if(!data)
#ifdef PREVIEW_CACHE_DEBUG
GSList *list;
PreviewCache *pc;
g_print ("preview cache dump:\n");
for (list = plist; list; list = g_slist_next (list))
{
/* printf("\tNo Cache\n"); */
return;
pc = (PreviewCache *) list->data;
g_print ("\tvalue w,h [%d,%d] => %p\n",
pc->width, pc->height, pc->preview);
}
/* printf("\tvalue w,h [%d,%d] => %p\n",pc->width,pc->height,pc->preview); */
#endif /* PREVIEW_CACHE_DEBUG */
}
void
gimp_preview_cache_invalidate(GSList **plist)
gimp_preview_cache_invalidate (GSList **plist)
{
/* printf("gimp_preview_cache_invalidate\n"); */
g_slist_foreach(*plist,preview_cache_print,NULL);
/* g_print ("gimp_preview_cache_invalidate\n"); */
preview_cache_print (*plist);
g_slist_foreach(*plist,preview_cache_invalidate,NULL);
g_slist_foreach (*plist, preview_cache_invalidate, NULL);
*plist = NULL;
}
void
gimp_preview_cache_add(GSList **plist,
TempBuf *buf)
gimp_preview_cache_add (GSList **plist,
TempBuf *buf)
{
PreviewCache *pc;
/* printf("gimp_preview_cache_add %d %d\n",buf->width,buf->height); */
g_slist_foreach(*plist,preview_cache_print,NULL);
/* g_print ("gimp_preview_cache_add %d %d\n",buf->width,buf->height); */
preview_cache_print (*plist);
if(g_slist_length(*plist) > MAX_CACHE_PREVIEWS)
if (g_slist_length (*plist) > MAX_CACHE_PREVIEWS)
{
/* Remove the smallest */
preview_cache_remove_smallest(plist);
......@@ -174,104 +206,116 @@ gimp_preview_cache_add(GSList **plist,
pc = g_new0(PreviewCache,1);
pc->preview = buf;
pc->width = buf->width;
pc->height = buf->height;
*plist = g_slist_insert_sorted(*plist,pc,preview_cache_compare);
pc->width = buf->width;
pc->height = buf->height;
*plist = g_slist_insert_sorted (*plist, pc, preview_cache_compare);
}
TempBuf *
gimp_preview_cache_get(GSList **plist,
gint width,
gint height)
gimp_preview_cache_get (GSList **plist,
gint width,
gint height)
{
PreviewNearest pn;
PreviewCache *pc;
PreviewNearest pn;
PreviewCache *pc;
/* printf("gimp_preview_cache_get %d %d\n",width,height); */
g_slist_foreach(*plist,preview_cache_print,NULL);
/* g_print ("gimp_preview_cache_get %d %d\n",width,height); */
preview_cache_print (*plist);
pn.pc = NULL;
pn.width = width;
pn.pc = NULL;
pn.width = width;
pn.height = height;
g_slist_foreach(*plist,preview_cache_find_exact,&pn);
g_slist_foreach (*plist, preview_cache_find_exact, &pn);
if(pn.pc && pn.pc->preview)
if (pn.pc && pn.pc->preview)
{
/* printf("extact value w,h [%d,%d] => %p\n",pn.pc->width,pn.pc->height,pn.pc->preview); */
/* g_print ("extact value w,h [%d,%d] => %p\n",
pn.pc->width,pn.pc->height,pn.pc->preview); */
return pn.pc->preview;
}
g_slist_foreach(*plist,preview_cache_find_biggest,&pn);
g_slist_foreach (*plist, preview_cache_find_biggest, &pn);
if(pn.pc)
if (pn.pc)
{
gint pwidth;
gint pheight;
gdouble x_ratio;
gdouble y_ratio;
guchar *src_data;
guchar *dest_data;
gint loop1,loop2;
/* printf("nearest value w,h [%d,%d] => %p\n",pn.pc->width,pn.pc->height,pn.pc->preview); */
gint pwidth;
gint pheight;
gdouble x_ratio;
gdouble y_ratio;
guchar *src_data;
guchar *dest_data;
gint loop1;
gint loop2;
/* g_print ("nearest value w,h [%d,%d] => %p\n",
pn.pc->width,pn.pc->height,pn.pc->preview); */
/* if(pn.pc->width == width && */
/* pn.pc->height == height) */
/* return pn.pc->preview; */
/* pn.pc->height == height) */
/* return pn.pc->preview; */
if(!pn.pc->preview)
if (!pn.pc->preview)
{
g_error("gimp_preview_cache_get:: Invalid cache item");
g_error ("gimp_preview_cache_get:: Invalid cache item");
return NULL;
}
/* Make up new preview from the large one... */
pwidth = pn.pc->preview->width;
pwidth = pn.pc->preview->width;
pheight = pn.pc->preview->height;
/* Now get the real one and add to cache */
/* printf("Must create from large preview\n"); */
pc = g_new0(PreviewCache,1);
pc->preview = temp_buf_new(width,height,pn.pc->preview->bytes,0,0,NULL);
/* g_print ("Must create from large preview\n"); */
pc = g_new0 (PreviewCache, 1);
pc->preview = temp_buf_new (width, height, pn.pc->preview->bytes,
0, 0, NULL);
/* preview from nearest bigger one */
if (width)
x_ratio = (gdouble)pwidth/(gdouble)width;
x_ratio = (gdouble) pwidth / (gdouble) width;
else
x_ratio = 0.0;
if (height)
y_ratio = (gdouble)pheight/(gdouble)height;
y_ratio = (gdouble) pheight / (gdouble) height;
else
y_ratio = 0.0;
src_data = temp_buf_data(pn.pc->preview);
dest_data = temp_buf_data(pc->preview);
/* printf("x_ratio , y_ratio [%f,%f]\n",x_ratio,y_ratio); */
/* g_print ("x_ratio , y_ratio [%f,%f]\n",x_ratio,y_ratio); */
for(loop1 = 0 ; loop1 < height ; loop1++)
for(loop2 = 0 ; loop2 < width ; loop2++)
for (loop1 = 0 ; loop1 < height ; loop1++)
for (loop2 = 0 ; loop2 < width ; loop2++)
{
int i;
guchar *src_pixel = src_data +
((gint)(loop2*x_ratio))*pn.pc->preview->bytes +
((gint)(loop1*y_ratio))*pwidth*pn.pc->preview->bytes;
guchar *dest_pixel = dest_data +
(loop2+loop1*width)*pn.pc->preview->bytes;
for(i = 0 ; i < pn.pc->preview->bytes; i++)
gint i;
guchar *src_pixel;
guchar *dest_pixel;
src_pixel = src_data +
((gint) (loop2 * x_ratio)) * pn.pc->preview->bytes +
((gint) (loop1 * y_ratio)) * pwidth * pn.pc->preview->bytes;
dest_pixel = dest_data +
(loop2 + loop1 * width) * pn.pc->preview->bytes;
for (i = 0; i < pn.pc->preview->bytes; i++)
*dest_pixel++ = *src_pixel++;
}
pc->width = width;
pc->width = width;
pc->height = height;
*plist = g_slist_insert_sorted(*plist,pc,preview_cache_compare);
/* printf("New preview created [%d,%d] => %p\n",pc->width,pc->height,pc->preview); */
*plist = g_slist_insert_sorted (*plist, pc, preview_cache_compare);
/* g_print ("New preview created [%d,%d] => %p\n",
pc->width,pc->height,pc->preview); */
return pc->preview;
}
/* printf("gimp_preview_cache_get returning NULL\n"); */
/* g_print ("gimp_preview_cache_get returning NULL\n"); */
return NULL;
}
......@@ -19,27 +19,20 @@
#ifndef __GIMPPREVIEWCACHE_H__
#define __GIMPPREVIEWCACHE_H__
#include "temp_buf.h"
typedef struct _PreviewCache {
TempBuf* preview;
gint width;
gint height;
} PreviewCache;
#include "temp_buf.h"
typedef struct _PreviewNearest {
PreviewCache *pc;
gint width;
gint height;
} PreviewNearest;
#define MAX_CACHE_PREVIEWS 5
#define PREVIEW_CACHE_PRIME_WIDTH 112
#define PREVIEW_CACHE_PRIME_WIDTH 112
#define PREVIEW_CACHE_PRIME_HEIGHT 112
TempBuf * gimp_preview_cache_get(GSList **,gint,gint);
void gimp_preview_cache_add(GSList **,TempBuf *);
void gimp_preview_cache_invalidate(GSList **);
TempBuf * gimp_preview_cache_get (GSList **plist,
gint width,
gint height);
void gimp_preview_cache_add (GSList **plist,
TempBuf *buf);
void gimp_preview_cache_invalidate (GSList **plist);
#endif /* __GIMPPREVIEWCACHE_H__ */
......@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <string.h>
......@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers;
ratio = (double) width / (double) gimage->width;
ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage))
{
......
......@@ -40,11 +40,12 @@ struct _LayerSelect
GdkPixmap *layer_pixmap;
GtkWidget *preview;
GImage *gimage;
Layer *current_layer;
gboolean dirty;
gint image_width, image_height;