Changeset 15309

Timestamp:

04/17/12 17:58:57 (11 years ago)

Author:

nit

Message:

[titan] scale only if scaleheight && scale width not height && width

File:

• titan/titan/skin.h (modified) (2 diffs)

titan/titan/skin.h

@@ -1536 +1536 @@
         buffer = (*cinfo.mem->alloc_sarray) ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
 
-        if(accelfb != NULL && accelfb->varfbsize > width * 8 && (scalewidth != 0 || scaleheight != 0))
+        if(accelfb != NULL && accelfb->varfbsize > width * 8 && (scalewidth != 0 || scaleheight != 0) && (scalewidth != width || scaleheight != height))
         {
                 //auto scale to mwidth / mheight
@@ -1830 +1830 @@
         if((pictype == 0 || pictype == 1) && buf == NULL) return;
 
-        if(pictype == 0 && (scalewidth != 0 || scaleheight != 0))
+        if(pictype == 0 && (scalewidth != 0 || scaleheight != 0) && (scalewidth != width || scaleheight != height))
         {
                 //auto scale to mwidth / mheight