[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48346] trunk/blender/source/blender/imbuf /intern: missed tiff using 150 dpi as default in previous commit, use a define now.

[Campbell Barton]

Revision: 48346
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48346
Author:   campbellbarton
Date:     2012-06-27 19:28:44 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
missed tiff using 150 dpi as default in previous commit, use a define now.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/allocimbuf.c
    trunk/blender/source/blender/imbuf/intern/tiff.c

Modified: trunk/blender/source/blender/imbuf/intern/allocimbuf.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/allocimbuf.c      2012-06-27 
18:39:17 UTC (rev 48345)
+++ trunk/blender/source/blender/imbuf/intern/allocimbuf.c      2012-06-27 
19:28:44 UTC (rev 48346)
@@ -351,7 +351,7 @@
                ibuf->planes = planes;
                ibuf->ftype = TGA;
                ibuf->channels = 4;  /* float option, is set to other values 
when buffers get assigned */
-               ibuf->ppm[0] = ibuf->ppm[1] = 72.0 / 0.0254; /* 72dpi -> 
pixels-per-meter */
+               ibuf->ppm[0] = ibuf->ppm[1] = IMB_DPI_DEFAULT / 0.0254; /* 
IMB_DPI_DEFAULT -> pixels-per-meter */
                
                if (flags & IB_rect) {
                        if (imb_addrectImBuf(ibuf) == FALSE) {

Modified: trunk/blender/source/blender/imbuf/intern/tiff.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/tiff.c    2012-06-27 18:39:17 UTC 
(rev 48345)
+++ trunk/blender/source/blender/imbuf/intern/tiff.c    2012-06-27 19:28:44 UTC 
(rev 48346)
@@ -811,7 +811,7 @@
                yres = (float)(ibuf->ppm[1] * 0.0254);
        }
        else {
-               xres = yres = 150.0f;
+               xres = yres = IMB_DPI_DEFAULT;
        }
 
        TIFFSetField(image, TIFFTAG_XRESOLUTION,     xres);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs