[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/plugins/painterlyframework
From:       Emanuele Tamponi <emanuele () valinor ! it>
Date:       2008-01-01 0:56:20
Message-ID: 1199148980.539201.6106.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 755306 by tamponi:

- Don't call KSToReflectance but do the operation in line.
- Fix the ChannelConverter Test


 M  +1 -2      channel_converter.h  
 M  +5 -5      tests/channel_converter_test.cpp  


--- trunk/koffice/krita/plugins/painterlyframework/channel_converter.h #755305:755306
@@ -60,8 +60,7 @@
     double q1, q2, k1, k2, D, Sh;
     double r0; // Represent the reflectance of the reference black (no, it's not zero)
 
-    KSToReflectance(KoColorSpaceMaths<double,_TYPE_>::scaleToA(Kb),
-                    KoColorSpaceMaths<double,_TYPE_>::scaleToA(Sb), r0);
+    r0 = 1.0 + (Kb/Sb) - sqrt( (Kb/Sb)*(Kb/Sb) + 2.0*(Kb/Sb) );
     q1 = Kb / ( 1.0 + Kb*PHI(r0) );
     k1 = 1.0 + q1 - sqrt( q1*q1 + 2.0*q1 );
 
--- trunk/koffice/krita/plugins/painterlyframework/tests/channel_converter_test.cpp #755305:755306
@@ -33,21 +33,21 @@
     R = 0.4999999999999;
     c.reflectanceToKS(R, K, S);
     qDebug() << "Reflectance " << R << "; K = " << K << ", S = " << S;
-    QCOMPARE((double)(S/K), (R*2.0/pow(1-R,2)));
+    QCOMPARE((S/K), (float)(R*2.0/pow(1-R,2)));
 
     R = 0.5000000000001;
     c.reflectanceToKS(R, K, S);
     qDebug() << "Reflectance " << R << "; K = " << K << ", S = " << S;
-    QCOMPARE((double)(S/K), (R*2.0/pow(1-R,2)));
+    QCOMPARE((S/K), (float)(R*2.0/pow(1-R,2)));
 
     for (int i = 0; i <= 100; i++) {
         R = (double)i/100.0;
         c.reflectanceToKS(R, K, S);
         qDebug() << "Reflectance " << R << "; K = " << K << ", S = " << S;
         if ( i <= 50 )
-            QCOMPARE((double)(S/K), (2.0*R*pow(1-R,-2)));
+            QCOMPARE((S/K), (float)(2.0*R*pow(1-R,-2)));
         else
-            QCOMPARE((double)(K/S), (0.5*pow(1-R, 2)/R));
+            QCOMPARE((K/S), (float)(0.5*pow(1-R, 2)/R));
     }
 
     // KSToReflectance
@@ -65,7 +65,7 @@
         c.KSToReflectance(K, S, R);
         qDebug() << "K " << K << ", S " << S << "; R = " << R;
         QVERIFY(R > 0.0 && R < 1.0);
-        QCOMPARE((double)(S/K), (R*2.0/pow(1-R,2)));
+        QCOMPARE((S/K), (float)(R*2.0/pow(1-R,2)));
     }
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]