Attachment #44572 for bug #71177

View | Details | Raw Unified | Return to bug 71177
Collapse All | Expand All




   RImage *rimage = rimage_load (filename, width, height);
   
   preview = rimage_2_preview (rimage, preview, FALSE);
   RReleaseImage (rimage);

   return preview;
}

					  : RDiagonalGradient));
	 preview = rimage_2_preview (rimage, preview,
				     TRUE && rimage->height < 100);
	 RReleaseImage (rimage);
      }

      for (k = start; k < n; k++)


      image = rimage_load (filename, -1, -1);
      tiled = RMakeTiledImage (image, width, height);
      RReleaseImage (image);
      
      if (tiled)
      {
	 RCombineImagesWithOpaqueness (tiled, gradient, opacity);
	 RReleaseImage (gradient);
	 
	 preview = rimage_2_preview (tiled, preview, FALSE);
	 RReleaseImage (tiled);
      }
      else
      {
	 preview = rimage_2_preview (gradient, preview, FALSE);
	 RReleaseImage (gradient);
      }
      return preview;
   }

      {
	 preview = rimage_2_preview (gradient, preview,
				     gradient->height < 100);
	 RReleaseImage (gradient);
      }
      else
	 preview = make_image (PKGDATADIR "/black.xpm",

      if (image)
      {
	 preview = rimage_2_preview (image, preview, image->height < 100);
	 RReleaseImage (image);
      }
      else
	 preview = make_image (PKGDATADIR "/black.xpm",

	 if (streq (filename, PKGDATADIR "/black.xpm"))
	 {
	    RImage *scaled = RScaleImage (image, width, height);
	    RReleaseImage (image);
	    image = scaled;
	 }
	 else if (image->width > (unsigned) width

	       width  = height * image->width / image->height;
	    
	    scaled = RScaleImage (image, max (width, 22), max (height, 22));
	    RReleaseImage (image);
	    image = scaled;
	 }
      }




	       width  = height * image->width / image->height;
	    
	    scaled = RScaleImage (image, max (width, 22), max (height, 22));
	    RReleaseImage (image);
	 }
	 else
	    scaled = image;

		  ptr++;
	    }
	 fclose (file);
	 RReleaseImage (scaled);
      }
#else  /* old wraster of wmaker < 0.62.0 */
      {

	       }
	    }
	 fclose (file);
	 RReleaseImage (scaled);
      }
#endif    
      return 0;

Return to bug 71177

Lines 111-117 Link Here

(-)wmakerconf-2.8.1/src/rimage.c (-10 / +10 lines)
111	RImage *rimage = rimage_load (filename, width, height);	111	RImage *rimage = rimage_load (filename, width, height);
112		112
113	preview = rimage_2_preview (rimage, preview, FALSE);	113	preview = rimage_2_preview (rimage, preview, FALSE);
114	RDestroyImage (rimage);	114	RReleaseImage (rimage);
115		115
116	return preview;	116	return preview;
117	}	117	}
Lines 160-166 Link Here
160	: RDiagonalGradient));	160	: RDiagonalGradient));
161	preview = rimage_2_preview (rimage, preview,	161	preview = rimage_2_preview (rimage, preview,
162	TRUE && rimage->height < 100);	162	TRUE && rimage->height < 100);
163	RDestroyImage (rimage);	163	RReleaseImage (rimage);
164	}	164	}
165		165
166	for (k = start; k < n; k++)	166	for (k = start; k < n; k++)
Lines 255-274 Link Here
255		255
256	image = rimage_load (filename, -1, -1);	256	image = rimage_load (filename, -1, -1);
257	tiled = RMakeTiledImage (image, width, height);	257	tiled = RMakeTiledImage (image, width, height);
258	RDestroyImage (image);	258	RReleaseImage (image);
259		259
260	if (tiled)	260	if (tiled)
261	{	261	{
262	RCombineImagesWithOpaqueness (tiled, gradient, opacity);	262	RCombineImagesWithOpaqueness (tiled, gradient, opacity);
263	RDestroyImage (gradient);	263	RReleaseImage (gradient);
264		264
265	preview = rimage_2_preview (tiled, preview, FALSE);	265	preview = rimage_2_preview (tiled, preview, FALSE);
266	RDestroyImage (tiled);	266	RReleaseImage (tiled);
267	}	267	}
268	else	268	else
269	{	269	{
270	preview = rimage_2_preview (gradient, preview, FALSE);	270	preview = rimage_2_preview (gradient, preview, FALSE);
271	RDestroyImage (gradient);	271	RReleaseImage (gradient);
272	}	272	}
273	return preview;	273	return preview;
274	}	274	}
Lines 340-346 Link Here
340	{	340	{
341	preview = rimage_2_preview (gradient, preview,	341	preview = rimage_2_preview (gradient, preview,
342	gradient->height < 100);	342	gradient->height < 100);
343	RDestroyImage (gradient);	343	RReleaseImage (gradient);
344	}	344	}
345	else	345	else
346	preview = make_image (PKGDATADIR "/black.xpm",	346	preview = make_image (PKGDATADIR "/black.xpm",
Lines 391-397 Link Here
391	if (image)	391	if (image)
392	{	392	{
393	preview = rimage_2_preview (image, preview, image->height < 100);	393	preview = rimage_2_preview (image, preview, image->height < 100);
394	RDestroyImage (image);	394	RReleaseImage (image);
395	}	395	}
396	else	396	else
397	preview = make_image (PKGDATADIR "/black.xpm",	397	preview = make_image (PKGDATADIR "/black.xpm",
Lines 432-438 Link Here
432	if (streq (filename, PKGDATADIR "/black.xpm"))	432	if (streq (filename, PKGDATADIR "/black.xpm"))
433	{	433	{
434	RImage *scaled = RScaleImage (image, width, height);	434	RImage *scaled = RScaleImage (image, width, height);
435	RDestroyImage (image);	435	RReleaseImage (image);
436	image = scaled;	436	image = scaled;
437	}	437	}
438	else if (image->width > (unsigned) width	438	else if (image->width > (unsigned) width
Lines 446-452 Link Here
446	width = height * image->width / image->height;	446	width = height * image->width / image->height;
447		447
448	scaled = RScaleImage (image, max (width, 22), max (height, 22));	448	scaled = RScaleImage (image, max (width, 22), max (height, 22));
449	RDestroyImage (image);	449	RReleaseImage (image);
450	image = scaled;	450	image = scaled;
451	}	451	}
452	}	452	}

Lines 95-101 Link Here

(-)wmakerconf-2.8.1/src/mkpreview.c (-3 / +3 lines)
95	width = height * image->width / image->height;	95	width = height * image->width / image->height;
96		96
97	scaled = RScaleImage (image, max (width, 22), max (height, 22));	97	scaled = RScaleImage (image, max (width, 22), max (height, 22));
98	RDestroyImage (image);	98	RReleaseImage (image);
99	}	99	}
100	else	100	else
101	scaled = image;	101	scaled = image;
Lines 135-141 Link Here
135	ptr++;	135	ptr++;
136	}	136	}
137	fclose (file);	137	fclose (file);
138	RDestroyImage (scaled);	138	RReleaseImage (scaled);
139	}	139	}
140	#else /* old wraster of wmaker < 0.62.0 */	140	#else /* old wraster of wmaker < 0.62.0 */
141	{	141	{
Lines 167-173 Link Here
167	}	167	}
168	}	168	}
169	fclose (file);	169	fclose (file);
170	RDestroyImage (scaled);	170	RReleaseImage (scaled);
171	}	171	}
172	#endif	172	#endif
173	return 0;	173	return 0;