[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49658] trunk/blender/source/blender/ compositor/operations/COM_ScaleOperation.cpp: use bilinear rather then bicubic scaling because bicubic blurs too much.

Campbell Barton ideasman42 at gmail.com
Tue Aug 7 17:01:48 CEST 2012


Revision: 49658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49658
Author:   campbellbarton
Date:     2012-08-07 15:01:48 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
use bilinear rather then bicubic scaling because bicubic blurs too much.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp	2012-08-07 14:59:49 UTC (rev 49657)
+++ trunk/blender/source/blender/compositor/operations/COM_ScaleOperation.cpp	2012-08-07 15:01:48 UTC (rev 49658)
@@ -22,9 +22,12 @@
 
 #include "COM_ScaleOperation.h"
 
-#define USE_FORCE_BICUBIC
+#define USE_FORCE_BILINEAR
 /* XXX - ignore input and use default from old compositor,
- * could become an option like the transform node - campbell */
+ * could become an option like the transform node - campbell
+ *
+ * note: use bilinear because bicubic makes fuzzy even when not scaling at all (1:1)
+ */
 
 ScaleOperation::ScaleOperation() : NodeOperation()
 {
@@ -56,8 +59,8 @@
 
 void ScaleOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
 {
-#ifdef USE_FORCE_BICUBIC
-	sampler = COM_PS_BICUBIC;
+#ifdef USE_FORCE_BILINEAR
+	sampler = COM_PS_BILINEAR;
 #endif
 
 	float scaleX[4];
@@ -126,8 +129,8 @@
 
 void ScaleAbsoluteOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
 {
-#ifdef USE_FORCE_BICUBIC
-	sampler = COM_PS_BICUBIC;
+#ifdef USE_FORCE_BILINEAR
+	sampler = COM_PS_BILINEAR;
 #endif
 
 	float scaleX[4];
@@ -247,8 +250,8 @@
 
 void ScaleFixedSizeOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
 {
-#ifdef USE_FORCE_BICUBIC
-	sampler = COM_PS_BICUBIC;
+#ifdef USE_FORCE_BILINEAR
+	sampler = COM_PS_BILINEAR;
 #endif
 
 	if (this->m_is_offset) {




More information about the Bf-blender-cvs mailing list