Re: [Lensfun-users] Fixed

[Mark Constable]

This is better. Sorry about dumping stuff here, not sure how else to
do this. Next bit of an issue is that make install does not respect
DESTDIR...

--- libs/lensfun/mod-color.cpp.orig     2008-05-11 21:55:43.000000000 +1000
+++ libs/lensfun/mod-color.cpp  2008-05-11 21:57:01.000000000 +1000
@@ -124,7 +124,7 @@
     return true;
 }

-template<typename T>static T *apply_multiplier (T *pixels, double c, int &cr)
+template<typename T>T *apply_multiplier (T *pixels, double c, int &cr)
 {
     for (;;)
     {
@@ -147,7 +147,7 @@
     return pixels;
 }

-template<> static lf_u8 *apply_multiplier (lf_u8 *pixels, double c, int &cr)
+template<> lf_u8 *apply_multiplier (lf_u8 *pixels, double c, int &cr)
 {
     // Use 20.12 fixed-point math
     int c12 = int (c * 4096.0);
@@ -173,7 +173,7 @@
     return pixels;
 }

-template<> static lf_u16 *apply_multiplier (lf_u16 *pixels, double c, int &cr)
+template<> lf_u16 *apply_multiplier (lf_u16 *pixels, double c, int &cr)
 {
     for (;;)
     {
@@ -197,7 +197,7 @@
     return pixels;
 }

-template<> static lf_u32 *apply_multiplier (lf_u32 *pixels, double c, int &cr)
+template<> lf_u32 *apply_multiplier (lf_u32 *pixels, double c, int &cr)
 {
     for (;;)
     {

 Current trace with above patch...

 ad...@minuet.lan /var/abs/local/eth-os/dev/lensfun/src/lensfun-0.0.1
make all
LINK.GCC.EXEC out/posix/release/makedep
mkdir -p out/posix/release/deps
touch out/posix/release/deps/.dir
MAKEDEP.GCC out/posix/release/deps/lensfun@lib@.dep
MAKEDEP.GCC out/posix/release/deps/auxfun@lib@.dep
MAKEDEP.GCC out/posix/release/deps/trwxml@exe@.dep
MAKEDEP.GCC out/posix/release/deps/tmod@exe@.dep
MAKEDEP.GCC out/posix/release/deps/tfun@exe@.dep
MAKEDEP.GCC out/posix/release/deps/example@exe@.dep
MAKEDEP.GCC out/posix/release/deps/makedep@exe@.dep
COMPILE.GCC.CXX libs/lensfun/mod-color.cpp
COMPILE.GCC.CXX libs/lensfun/mount.cpp
LINK.GCC.SO out/posix/release/liblensfun.so
LINK.GCC.EXEC out/posix/release/example
COMPILE.GCC.CXX tests/tfun/tfun.cpp
LINK.GCC.EXEC out/posix/release/tfun
COMPILE.GCC.CXX tests/tmod/tmod.cpp
tests/tmod/tmod.cpp:49: warning: deprecated conversion from string
constant to &#8216;char*&#8217;
tests/tmod/tmod.cpp: In function &#8216;int main(int, char**)&#8217;:
tests/tmod/tmod.cpp:257: warning: suggest explicit braces to avoid
ambiguous &#8216;else&#8217;
COMPILE.GCC.CXX libs/auxfun/image.cpp
LINK.GCC.AR out/posix/release/libauxfun.a
LINK.GCC.EXEC out/posix/release/tmod
COMPILE.GCC.CXX tests/trwxml/trwxml.cpp
tests/trwxml/trwxml.cpp:21: warning: deprecated conversion from string
constant to &#8216;char*&#8217;
LINK.GCC.EXEC out/posix/release/trwxml
DOXYGEN out/posix/release/docs/manual
ad...@minuet.lan /var/abs/local/eth-os/dev/lensfun/src/lensfun-0.0.1
make DESTDIR=/var/abs/local/eth-os/pkg/ install
INSTALL out/posix/release/liblensfun.so to /usr/lib64/
install: cannot change permissions of `/usr/lib64/': No such file or
directory
make: *** [install-lensfun] Error 1

------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment 
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Lensfun-users mailing list
Lensfun-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lensfun-users