[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36409] trunk/blender/source/blender/ blenkernel/intern/image.c: tweak image stamp, was 1px overlap and text was drawn too far up.
Campbell Barton
ideasman42 at gmail.com
Sun May 1 11:39:32 CEST 2011
Revision: 36409
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36409
Author: campbellbarton
Date: 2011-05-01 09:39:32 +0000 (Sun, 01 May 2011)
Log Message:
-----------
tweak image stamp, was 1px overlap and text was drawn too far up.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-05-01 09:21:45 UTC (rev 36408)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-05-01 09:39:32 UTC (rev 36409)
@@ -675,8 +675,10 @@
int BKE_imtype_to_ftype(int imtype)
{
- if(imtype==0)
+ if(imtype==R_TARGA)
return TGA;
+ else if(imtype==R_RAWTGA)
+ return RAWTGA;
else if(imtype== R_IRIS)
return IMAGIC;
#ifdef WITH_HDR
@@ -703,10 +705,6 @@
else if (imtype==R_DPX)
return DPX;
#endif
- else if (imtype==R_TARGA)
- return TGA;
- else if(imtype==R_RAWTGA)
- return RAWTGA;
#ifdef WITH_OPENJPEG
else if(imtype==R_JP2)
return JP2;
@@ -1044,7 +1042,6 @@
BLF_boundbox(mono, "j", &box);
y_ofs = (int)(baseline - box.ymin);
if(y_ofs < 0) y_ofs= 0; /* should never happen */
- y_ofs++;
}
x= 0;
@@ -1063,7 +1060,7 @@
BLF_draw_buffer(mono, stamp_data.file);
/* the extra pixel for background. */
- y -= 4;
+ y -= 5;
}
/* Top left corner, below File */
@@ -1078,7 +1075,7 @@
BLF_draw_buffer(mono, stamp_data.note);
/* the extra pixel for background. */
- y -= 4;
+ y -= 5;
}
/* Top left corner, below File (or Note) */
@@ -1093,7 +1090,7 @@
BLF_draw_buffer(mono, stamp_data.date);
/* the extra pixel for background. */
- y -= 4;
+ y -= 5;
}
/* Top left corner, below File, Date or Note */
More information about the Bf-blender-cvs
mailing list