[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd pnm_src/pnm_grok.cxx cvd_src/Linux/dvbuf...
From: |
Edward Rosten |
Subject: |
[libcvd-members] libcvd pnm_src/pnm_grok.cxx cvd_src/Linux/dvbuf... |
Date: |
Mon, 03 Oct 2011 15:05:10 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 11/10/03 15:05:10
Modified files:
pnm_src : pnm_grok.cxx
cvd_src/Linux : dvbuffer3_dc1394v2.cc
cvd : gl_helpers.h
progs : calibrate.cxx
Added files:
. : configure_osx_32bit
Log message:
OSX 10.6 fixed from Robert Castle
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/pnm_grok.cxx?cvsroot=libcvd&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc?cvsroot=libcvd&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/gl_helpers.h?cvsroot=libcvd&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/libcvd/progs/calibrate.cxx?cvsroot=libcvd&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure_osx_32bit?cvsroot=libcvd&rev=1.1
Patches:
Index: pnm_src/pnm_grok.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/pnm_grok.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- pnm_src/pnm_grok.cxx 7 Apr 2011 22:45:51 -0000 1.16
+++ pnm_src/pnm_grok.cxx 3 Oct 2011 15:05:09 -0000 1.17
@@ -631,7 +631,7 @@
//for (size_t i=0; i<n_shorts; i++)
//o << data[2*i+1] <<
data[2*i];
#else
- o.write((const char*)data,
n*sizeof(unsigned short));
+ o.write((const char*)data,
n_shorts*sizeof(unsigned short));
#endif
}
Index: cvd_src/Linux/dvbuffer3_dc1394v2.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/Linux/dvbuffer3_dc1394v2.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- cvd_src/Linux/dvbuffer3_dc1394v2.cc 19 Apr 2011 13:39:01 -0000 1.15
+++ cvd_src/Linux/dvbuffer3_dc1394v2.cc 3 Oct 2011 15:05:09 -0000 1.16
@@ -128,7 +128,7 @@
static DV3ColourFilter DV3_from_DC_ColourFilter(dc1394color_filter_t f,
uint32_t /*vendor*/, uint32_t /*model*/, uint64_t guid)
{
// some cameras report incorrect bayer patterns
- if (guid==0x814436200006075) { return GBRG; }
+ if (guid==0x814436200006075ULL) { return GBRG; }
return static_cast<DV3ColourFilter>(f - DC1394_COLOR_FILTER_MIN);
}
@@ -155,7 +155,7 @@
{
// some cameras report their raw bayer mode as being mono and do not
// have a mono mode at all...
- if (guid==0x814436200006075) {
+ if (guid==0x814436200006075ULL) {
//vendor==0x81443 model==0x0 ?
switch(s)
{
Index: cvd/gl_helpers.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/gl_helpers.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- cvd/gl_helpers.h 18 Feb 2011 11:39:34 -0000 1.48
+++ cvd/gl_helpers.h 3 Oct 2011 15:05:09 -0000 1.49
@@ -36,8 +36,17 @@
#ifdef WIN32
#include <windows.h>
#endif
+
+#ifdef _OSX
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
#include <GL/gl.h>
#include <GL/glu.h>
+#endif
+
+
+
#include <cvd/internal/gl_types.h>
#ifdef CVD_HAVE_TOON
Index: progs/calibrate.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/progs/calibrate.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- progs/calibrate.cxx 12 Nov 2009 16:26:52 -0000 1.19
+++ progs/calibrate.cxx 3 Oct 2011 15:05:10 -0000 1.20
@@ -810,12 +810,19 @@
videoBuffer->put_frame(vframe);
glDisable(GL_BLEND);
- glEnable(GL_TEXTURE_RECTANGLE_NV);
+ #ifdef GL_TEXTURE_RECTANGLE_ARB
+ texTarget=GL_TEXTURE_RECTANGLE_ARB;
+ #elif defined GL_TEXTURE_RECTANGLE_NV
+ texTarget=GL_TEXTURE_RECTANGLE_NV;
+ #else
+ texTarget=GL_TEXTURE_RECTANGLE_EXT;
+ #endif
+ glEnable(texTarget);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glTexParameterf( GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER,
GL_NEAREST );
- glTexParameterf( GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER,
GL_NEAREST );
+ glTexParameterf( texTarget, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+ glTexParameterf( texTarget, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
glPixelStorei(GL_UNPACK_ALIGNMENT,1);
- glTexImage2D(temp, 0, GL_TEXTURE_RECTANGLE_NV);
+ glTexImage2D(temp, 0, texTarget);
glBegin(GL_QUADS);
glTexCoord2i(0, 0);
glVertex2i(0,0);
@@ -826,7 +833,8 @@
glTexCoord2i(0, temp.size().y);
glVertex2i(0, disp.size().y);
glEnd ();
- glDisable(GL_TEXTURE_RECTANGLE_NV);
+ glDisable(texTarget);
+
glEnable(GL_BLEND);
//this is the bit that does the calibrating
Index: configure_osx_32bit
===================================================================
RCS file: configure_osx_32bit
diff -N configure_osx_32bit
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ configure_osx_32bit 3 Oct 2011 15:05:10 -0000 1.1
@@ -0,0 +1,26 @@
+#!/bin/bash
+#This script forces Snow Leopard (10.6) to build using Leopard (10.5)
+and to build a 32 bit build.
+# Use it when building livCVD, GVars, and lib3ds
+#
+# Originally wirrten by Damian Stewart
+# http://lists.nongnu.org/archive/html/libcvd-members/2010-05/msg00000.html
+# Modified by Robert Castle
+
+SDK="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
+SDKLIB="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.6.sdk"
+export MACOSX_DEPLOYMENT_TARGET="10.5"
+
+ARCH="-arch i386"
+
+export CFLAGS="$ARCH $SDK -mmacosx-version-min=10.5 -m32 -D_OSX"
+export CXXFLAGS="$ARCH $SDK -mmacosx-version-min=10.5 -m32 -D_OSX"
+export CPPFLAGS="$ARCH $SDK -mmacosx-version-min=10.5 -m32 -D_OSX"
+export LDFLAGS="$ARCH $SDKLIB -mmacosx-version-min=10.5 -m32"
+
+CC="/usr/bin/gcc-4.2"
+CXX="/usr/bin/g++-4.2"
+OBJC="/usr/bin/gcc-4.2"
+
+./configure $1 $2 $3 $4 $5 $6 $7 $8 $9
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd pnm_src/pnm_grok.cxx cvd_src/Linux/dvbuf...,
Edward Rosten <=