Author: post
Date: 2009-08-04 20:38:31 +0200 (Tue, 04 Aug 2009)
New Revision: 93
Modified:
RawSpeed/Cr2Decoder.cpp
RawSpeed/LJpegPlain.cpp
Log:
Linux fixes and color conversion fix, be sure to use "make -f
rawstudio-plugin.makefile clean".
Modified: RawSpeed/Cr2Decoder.cpp
===================================================================
--- RawSpeed/Cr2Decoder.cpp 2009-08-04 18:13:21 UTC (rev 92)
+++ RawSpeed/Cr2Decoder.cpp 2009-08-04 18:38:31 UTC (rev 93)
@@ -150,8 +150,8 @@
}
#define YUV_TO_RGB(Y, Cb, Cr) r = (int)Y + (( 200*(int)Cb + 22929*(int)Cr) >>
12);\
- g = (int)Y + ((-5640*(int)Cb - 11751*(int)Cb) >> 12);\
- b = (int)Y + ((29040*(int)Cb - 101*(int)Cb) >> 12);
+ g = (int)Y + ((-5640*(int)Cb - 11751*(int)Cr) >> 12);\
+ b = (int)Y + ((29040*(int)Cb - 101*(int)Cr) >> 12);
/* sRaw interpolators - ugly as sin, but does the job in reasonably speed */
Modified: RawSpeed/LJpegPlain.cpp
===================================================================
--- RawSpeed/LJpegPlain.cpp 2009-08-04 18:13:21 UTC (rev 92)
+++ RawSpeed/LJpegPlain.cpp 2009-08-04 18:38:31 UTC (rev 93)
@@ -1,22 +1,22 @@
#include "StdAfx.h"
#include "LJpegPlain.h"
-/*
- RawSpeed - RAW file decoder.
-
- Copyright (C) 2009 Klaus Post
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
+/*
+ RawSpeed - RAW file decoder.
+
+ Copyright (C) 2009 Klaus Post
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
http://www.klauspost.com
@@ -283,7 +283,6 @@
mRaw->subsampling.y = 2;
guchar *draw = mRaw->getData();
- guint pixGroup = 6; // How many pixels per group.
//Prepare slices (for CR2)
guint slices = (guint)slicesW.size()*(frame.h-skipY)/2;
@@ -410,7 +409,6 @@
*/
guchar *draw = mRaw->getData();
- guint pixGroup = 4; // How many pixels per group.
//Prepare slices (for CR2)
guint slices = (guint)slicesW.size()*(frame.h-skipY);
@@ -420,7 +418,6 @@
guint t_x = 0;
guint t_s = 0;
guint slice = 0;
- guint pitch_s = mRaw->pitch/2; // Pitch in shorts
// This is divided by comps, since comps pixels are processed at the time
for (guint i = 0 ; i < slicesW.size(); i++)
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
