Menu
▾
▴
freepv-cvs — cvs commit mailing list
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(34) |
Oct
(55) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(3) |
Jun
(9) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
(4) |
Mar
(13) |
Apr
(1) |
May
(3) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
(2) |
Nov
(3) |
Dec
|
| 2009 |
Jan
(1) |
Feb
(4) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bru...@us...> - 2016-01-08 23:52:17
|
Revision: 168
http://sourceforge.net/p/freepv/code/168
Author: brunopostle
Date: 2016-01-08 23:52:15 +0000 (Fri, 08 Jan 2016)
Log Message:
-----------
don't build browser plugin
Modified Paths:
--------------
freepv/trunk/CMakeLists.txt
freepv/trunk/src/CMakeLists.txt
freepv/trunk/src/libfreepv/Image.cpp
freepv/trunk/src/libfreepv/Image.h
freepv/trunk/src/libfreepv/JpegReader.cpp
freepv/trunk/src/libfreepv/pngReader.cpp
Modified: freepv/trunk/CMakeLists.txt
===================================================================
--- freepv/trunk/CMakeLists.txt 2011-07-15 21:07:01 UTC (rev 167)
+++ freepv/trunk/CMakeLists.txt 2016-01-08 23:52:15 UTC (rev 168)
@@ -89,7 +89,7 @@
find_package(FREEGLUT REQUIRED)
find_package(OpenGL REQUIRED)
find_package(X11 REQUIRED)
-find_package(GECKO REQUIRED)
+#find_package(GECKO REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(PNG REQUIRED)
find_package(XF86VM REQUIRED)
Modified: freepv/trunk/src/CMakeLists.txt
===================================================================
--- freepv/trunk/src/CMakeLists.txt 2011-07-15 21:07:01 UTC (rev 167)
+++ freepv/trunk/src/CMakeLists.txt 2016-01-08 23:52:15 UTC (rev 168)
@@ -5,7 +5,7 @@
add_subdirectory (freepv-glut)
add_subdirectory (utils)
if(UNIX)
- add_subdirectory (freepv-mozilla)
+# add_subdirectory (freepv-mozilla)
add_subdirectory (freepv-glx)
endif(UNIX)
Modified: freepv/trunk/src/libfreepv/Image.cpp
===================================================================
--- freepv/trunk/src/libfreepv/Image.cpp 2011-07-15 21:07:01 UTC (rev 167)
+++ freepv/trunk/src/libfreepv/Image.cpp 2016-01-08 23:52:15 UTC (rev 168)
@@ -74,7 +74,7 @@
for (int y=size.h; y; y--)
{
- memcpy(destPtr, srcPtr, destStride);
+ std::memcpy(destPtr, srcPtr, destStride);
destPtr += destStride;
srcPtr += srcStride;
}
@@ -114,7 +114,7 @@
for (int y=srcSize.h; y; y--)
{
// pad texture
- memcpy(destPtr, srcPtr, srcSize.w*color_channels);
+ std::memcpy(destPtr, srcPtr, srcSize.w*color_channels);
unsigned char *srcPtrt = srcPtr + color_channels*(srcSize.w-1);
unsigned char *destPtrt = destPtr + srcSize.w*color_channels;
for (int x=destPos.x + srcSize.w ; x < dest->size().w; x++) {
@@ -127,7 +127,7 @@
} else {
for (int y=srcSize.h; y; y--)
{
- memcpy(destPtr, srcPtr, srcSize.w*color_channels);
+ std::memcpy(destPtr, srcPtr, srcSize.w*color_channels);
destPtr += destStride;
srcPtr += srcStride;
}
@@ -136,7 +136,7 @@
if (padY) {
for (int y=(destPos.y + srcSize.h); y < dest->size().h ; y++)
{
- memcpy(destPtr, srcPtr, srcSize.w*color_channels);
+ std::memcpy(destPtr, srcPtr, srcSize.w*color_channels);
unsigned char *srcPtrt = srcPtr + color_channels*(srcSize.w-1);
unsigned char *destPtrt = destPtr + srcSize.w*color_channels;
for (int x=destPos.x + srcSize.w ; x < dest->size().w; x++) {
Modified: freepv/trunk/src/libfreepv/Image.h
===================================================================
--- freepv/trunk/src/libfreepv/Image.h 2011-07-15 21:07:01 UTC (rev 167)
+++ freepv/trunk/src/libfreepv/Image.h 2016-01-08 23:52:15 UTC (rev 168)
@@ -33,6 +33,7 @@
#include <string>
#include <assert.h>
#include <cstdlib>
+#include <cstring>
#include "Platform.h"
Modified: freepv/trunk/src/libfreepv/JpegReader.cpp
===================================================================
--- freepv/trunk/src/libfreepv/JpegReader.cpp 2011-07-15 21:07:01 UTC (rev 167)
+++ freepv/trunk/src/libfreepv/JpegReader.cpp 2016-01-08 23:52:15 UTC (rev 168)
@@ -267,7 +267,7 @@
jpeg_create_decompress(&cinfo);
/* Step 2: specify data source (eg, a file) */
- jpeg_mem_src(&cinfo, buffer, buf_len);
+ FPV::jpeg_mem_src(&cinfo, buffer, buf_len);
/* Step 3: read file parameters with jpeg_read_header() */
Modified: freepv/trunk/src/libfreepv/pngReader.cpp
===================================================================
--- freepv/trunk/src/libfreepv/pngReader.cpp 2011-07-15 21:07:01 UTC (rev 167)
+++ freepv/trunk/src/libfreepv/pngReader.cpp 2016-01-08 23:52:15 UTC (rev 168)
@@ -134,8 +134,8 @@
//Transfor grayscale images with less
//than 8 bits to 8 bits
- if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
- png_set_gray_1_2_4_to_8(p_png_struct);
+ //if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
+ // png_set_gray_1_2_4_to_8(p_png_struct);
//Add a full alpha channel if there is
//transparency information in the tRNS chunk
@@ -282,8 +282,8 @@
//Transfor grayscale images with less
//than 8 bits to 8 bits.
- if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
- png_set_gray_1_2_4_to_8(p_png_struct);
+ //if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
+ // png_set_gray_1_2_4_to_8(p_png_struct);
//Add a full alpha channel if there is
//transparency information in the tRNS chunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2011-07-15 21:07:07
|
Revision: 167
http://freepv.svn.sourceforge.net/freepv/?rev=167&view=rev
Author: brunopostle
Date: 2011-07-15 21:07:01 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Fix for gcc-4.6.0
Modified Paths:
--------------
freepv/trunk/src/libfreepv/Behavior.h
Modified: freepv/trunk/src/libfreepv/Behavior.h
===================================================================
--- freepv/trunk/src/libfreepv/Behavior.h 2009-06-30 08:10:28 UTC (rev 166)
+++ freepv/trunk/src/libfreepv/Behavior.h 2011-07-15 21:07:01 UTC (rev 167)
@@ -28,6 +28,7 @@
#include <list>
#include <map>
+#include <cstddef>
#include "Events.h"
namespace FPV
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-06-30 11:53:20
|
Revision: 166
http://freepv.svn.sourceforge.net/freepv/?rev=166&view=rev
Author: brunopostle
Date: 2009-06-30 08:10:28 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
newer xulrunner has npfunctions.h not npupp.h
Modified Paths:
--------------
freepv/trunk/CMakeScripts/FindGECKO.cmake
freepv/trunk/src/config.h.in.cmake
freepv/trunk/src/freepv-mozilla/npplat.h
Modified: freepv/trunk/CMakeScripts/FindGECKO.cmake
===================================================================
--- freepv/trunk/CMakeScripts/FindGECKO.cmake 2009-06-29 22:37:01 UTC (rev 165)
+++ freepv/trunk/CMakeScripts/FindGECKO.cmake 2009-06-30 08:10:28 UTC (rev 166)
@@ -30,6 +30,11 @@
SET(GECKO_INCLUDE_DIR ${GECKO_ROOT_DIR} ${GECKO_NSPR_DIR})
SET(GECKO_LIBRARY ${Xt_LIBRARY})
+ FIND_PATH(NPFUNCTIONS_H_DIR npfunctions.h ${GECKO_ROOT_DIR})
+ IF (NPFUNCTIONS_H_DIR)
+ SET(HAVE_NPFUNCTIONS_H TRUE)
+ ENDIF (NPFUNCTIONS_H_DIR)
+
IF (GECKO_INCLUDE_DIR AND GECKO_LIBRARY)
SET(GECKO_FOUND TRUE)
SET(GECKO_LIBRARIES ${GECKO_LIBRARY})
Modified: freepv/trunk/src/config.h.in.cmake
===================================================================
--- freepv/trunk/src/config.h.in.cmake 2009-06-29 22:37:01 UTC (rev 165)
+++ freepv/trunk/src/config.h.in.cmake 2009-06-30 08:10:28 UTC (rev 166)
@@ -24,3 +24,6 @@
/* Define to 1 if you have are under Windows */
#cmakedefine XP_WIN 1
+/* newer xulrunner has npfunctions.h not npupp.h */
+#cmakedefine HAVE_NPFUNCTIONS_H 1
+
Modified: freepv/trunk/src/freepv-mozilla/npplat.h
===================================================================
--- freepv/trunk/src/freepv-mozilla/npplat.h 2009-06-29 22:37:01 UTC (rev 165)
+++ freepv/trunk/src/freepv-mozilla/npplat.h 2009-06-30 08:10:28 UTC (rev 166)
@@ -40,7 +40,11 @@
#include "config.h"
#include "npapi.h"
+#ifdef HAVE_NPFUNCTIONS_H
+#include "npfunctions.h"
+#else
#include "npupp.h"
+#endif
/**************************************************/
/* */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-06-29 22:38:13
|
Revision: 165
http://freepv.svn.sourceforge.net/freepv/?rev=165&view=rev
Author: brunopostle
Date: 2009-06-29 22:37:01 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Fix apparent typo that breaks compilation with glibc-2.10
Modified Paths:
--------------
freepv/trunk/src/libfreepv/SPiVparser.cpp
Modified: freepv/trunk/src/libfreepv/SPiVparser.cpp
===================================================================
--- freepv/trunk/src/libfreepv/SPiVparser.cpp 2009-05-28 23:30:30 UTC (rev 164)
+++ freepv/trunk/src/libfreepv/SPiVparser.cpp 2009-06-29 22:37:01 UTC (rev 165)
@@ -490,7 +490,7 @@
{
char * aux_url=NULL;
char * url=(char*) _url;
- if(aux_url = strrchr (_url,'/'))
+ if(aux_url == strrchr (_url,'/'))
{
url=aux_url;
url++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-05-28 23:30:38
|
Revision: 164
http://freepv.svn.sourceforge.net/freepv/?rev=164&view=rev
Author: brunopostle
Date: 2009-05-28 23:30:30 +0000 (Thu, 28 May 2009)
Log Message:
-----------
Build libfreepv as a dynamic library
Modified Paths:
--------------
freepv/trunk/CMakeLists.txt
freepv/trunk/src/libfreepv/CMakeLists.txt
freepv/trunk/src/utils/CMakeLists.txt
Modified: freepv/trunk/CMakeLists.txt
===================================================================
--- freepv/trunk/CMakeLists.txt 2009-05-07 19:33:25 UTC (rev 163)
+++ freepv/trunk/CMakeLists.txt 2009-05-28 23:30:30 UTC (rev 164)
@@ -45,7 +45,7 @@
set(V_MAJOR 0)
set(V_MINOR 3)
-set(V_PATCH 0)
+set(V_PATCH 1)
# set destination dirs relative to PREFIX
SET(LIBDIR lib${LIB_SUFFIX})
@@ -112,6 +112,8 @@
${PNG_INCLUDE_DIR}
${XF86VM_INCLUDE_DIR})
+set(FREEPV_LIB_VERSION 0.0)
+
#########################################################################
# CONFIGURE #
#***********************************************************************#
@@ -180,6 +182,7 @@
"\\\\.a$"
"\\\\.lo$"
"\\\\.so$"
+"\\\\.so\\\\."
"\\\\.la$"
"/Makefile\\\\.in$"
"/Makefile$"
Modified: freepv/trunk/src/libfreepv/CMakeLists.txt
===================================================================
--- freepv/trunk/src/libfreepv/CMakeLists.txt 2009-05-07 19:33:25 UTC (rev 163)
+++ freepv/trunk/src/libfreepv/CMakeLists.txt 2009-05-28 23:30:30 UTC (rev 164)
@@ -1,5 +1,5 @@
-add_library(freepv STATIC PanoViewer.cpp Parameters.cpp Platform.cpp
+add_library(freepv SHARED PanoViewer.cpp Parameters.cpp Platform.cpp
OpenGLRenderer.cpp Image.cpp Scene.cpp
SceneElement.cpp Behavior.cpp
Action.cpp Subject.cpp EventProcessor.cpp
@@ -14,6 +14,7 @@
glutfont/freeglut_glutfont_definitions.c
Math/Matrix4.cpp Math/quaternion.cpp)
+set_target_properties(freepv PROPERTIES VERSION ${FREEPV_LIB_VERSION})
INSTALL(FILES Controller.h FPV_keysyms.h Image.h PanoViewer.h Parameters.h Platform.h QTVRDecoder.h Renderer.h Scene.h SPiVparser.h utils.h DESTINATION include/libfreepv)
INSTALL(TARGETS freepv DESTINATION ${LIBDIR})
Modified: freepv/trunk/src/utils/CMakeLists.txt
===================================================================
--- freepv/trunk/src/utils/CMakeLists.txt 2009-05-07 19:33:25 UTC (rev 163)
+++ freepv/trunk/src/utils/CMakeLists.txt 2009-05-28 23:30:30 UTC (rev 164)
@@ -1,6 +1,7 @@
INCLUDE_DIRECTORIES(${FreePV_SOURCE_DIR}/src/libfreepv)
ADD_EXECUTABLE(qtvr2img qtvr2img.cpp)
-TARGET_LINK_LIBRARIES(qtvr2img freepv ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES})
+TARGET_LINK_LIBRARIES(qtvr2img freepv ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES}
+ ${LIBXML2_LIBRARIES} ${OPENGL_LIBRARIES} ${PNG_LIBRARIES})
INSTALL(TARGETS qtvr2img DESTINATION bin)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-05-07 19:33:34
|
Revision: 163
http://freepv.svn.sourceforge.net/freepv/?rev=163&view=rev
Author: brunopostle
Date: 2009-05-07 19:33:25 +0000 (Thu, 07 May 2009)
Log Message:
-----------
gcc-4.4.0 build fixes (Luk?\195?\161?\197?\161 Jirkovsk?\195?\189)
Modified Paths:
--------------
freepv/trunk/src/libfreepv/OpenGLRenderer.cpp
freepv/trunk/src/libfreepv/QTVRDecoder.cpp
freepv/trunk/src/libfreepv/Utils/signatures.cpp
freepv/trunk/src/libfreepv/utils.cpp
Modified: freepv/trunk/src/libfreepv/OpenGLRenderer.cpp
===================================================================
--- freepv/trunk/src/libfreepv/OpenGLRenderer.cpp 2009-05-01 23:32:36 UTC (rev 162)
+++ freepv/trunk/src/libfreepv/OpenGLRenderer.cpp 2009-05-07 19:33:25 UTC (rev 163)
@@ -26,7 +26,8 @@
#include <config.h>
#include <vector>
-#include <math.h>
+#include <cmath>
+#include <cstdio>
#include "OpenGLRenderer.h"
#include "Scene.h"
Modified: freepv/trunk/src/libfreepv/QTVRDecoder.cpp
===================================================================
--- freepv/trunk/src/libfreepv/QTVRDecoder.cpp 2009-05-01 23:32:36 UTC (rev 162)
+++ freepv/trunk/src/libfreepv/QTVRDecoder.cpp 2009-05-07 19:33:25 UTC (rev 163)
@@ -42,6 +42,7 @@
#include <errno.h>
#include <vector>
#include <cstring>
+#include <cstdio>
#include <zlib.h>
Modified: freepv/trunk/src/libfreepv/Utils/signatures.cpp
===================================================================
--- freepv/trunk/src/libfreepv/Utils/signatures.cpp 2009-05-01 23:32:36 UTC (rev 162)
+++ freepv/trunk/src/libfreepv/Utils/signatures.cpp 2009-05-07 19:33:25 UTC (rev 163)
@@ -24,6 +24,7 @@
#include "signatures.h"
#include <iostream>
+#include <cstdio>
namespace FPV{
namespace Utils{
Modified: freepv/trunk/src/libfreepv/utils.cpp
===================================================================
--- freepv/trunk/src/libfreepv/utils.cpp 2009-05-01 23:32:36 UTC (rev 162)
+++ freepv/trunk/src/libfreepv/utils.cpp 2009-05-07 19:33:25 UTC (rev 163)
@@ -23,6 +23,7 @@
*/
#include <algorithm>
+#include <cstdio>
#include "utils.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-05-01 23:32:40
|
Revision: 162
http://freepv.svn.sourceforge.net/freepv/?rev=162&view=rev
Author: brunopostle
Date: 2009-05-01 23:32:36 +0000 (Fri, 01 May 2009)
Log Message:
-----------
Update freepv website for 0.3.0 release
Modified Paths:
--------------
website/index.shtml
Modified: website/index.shtml
===================================================================
--- website/index.shtml 2009-05-01 23:11:03 UTC (rev 161)
+++ website/index.shtml 2009-05-01 23:32:36 UTC (rev 162)
@@ -13,15 +13,20 @@
<div class="content">
<h1>FreePV - Opensource panorama viewer</h1>
-<p>Goal: a powerful and truly cross platform viewer for panoramic images, both on your harddrive and inside web pages.</p>
+<p>FreePV is a viewer for QuickTime (QTVR), SPiV, cylindrical, cubic
+and cylindrical panoramas. The package provides a standalone
+panorama viewer and a Firefox/Mozilla plugin.</p>
<h2>Status</h2>
-<p>FreePV is still in its early development state, however standalone viewers and plugins for Unix and Windows are already available. It is currently the best way to view QTVR files on Unix computers.
+<p>FreePV is still in development, however standalone viewers and plugins for Unix and Windows are already available. It is currently the best way to view QTVR files on Unix computers.
</p>
+<h3>1<sup>st</sup> May 2009 ­ FreePV 0.3.0 released</h3>
+<p>After nearly two years without a stable release, <a href="http://sourceforge.net/project/showfiles.php?group_id=148373&package_id=206947">freepv-0.3.0 can now be downloaded</a> from Sourceforge.</p>
+<h3>20<sup>th</sup> April 2009 ­ Google Summer of Code</h3>
+<p>León Moctezuma will be <a href="http://wiki.videolan.org/SoC_2009/QuickTimeVR_Playback">integrating the FreePV library into VLC</a> (VideoLAN) as part of the 2009 Google Summer of Code.</p>
-
<h3>Current features</h3>
<ul>
<li>Hardware accelerated rendering for smooth viewing experience, based on OpenGL</li>
@@ -33,9 +38,6 @@
<h3>Limitations</h3>
<ul>
-<li>Rendering of the windows mozilla plugin is not very smooth (will be improved soon)</li>
-<li>Equirectangular panorams not yet supported</li>
-<li>Display of cylindrical panorams currently of low quality (will be improved soon)</li>
<li>Hotspots and multi node QTVR files not supported</li>
<li>No scripting support</li>
</ul>
@@ -45,15 +47,15 @@
<h3>Linux</h3>
<p>
<a href="http://sourceforge.net/project/showfiles.php?group_id=148373">Download the source package</a>.
-Currently, no prebuild packages are available. FreePV can be build with the usual
+Currently, no prebuilt packages are available. FreePV can be built with cmake:
</p>
<pre>
-$ ./configure
+$ cmake .
$ make
$ make install
</pre>
<p>
-process. For building, the following packages are required (including development packages!):
+For building, the following packages are required (including development packages!):
</p>
<ul>
<li>OpenGL (Mesa3D or other)</li>
@@ -112,6 +114,7 @@
<li><a href="http://sinnfrei.at">Thomas Rauscher</a> (glut standalone viewer) </li>
<li><a href="http://pangeasoft.net">Brian Greenstone</a> (base for QTVR parser) </li>
<li><a href="http://www.fsoft.it/panorama/FSPViewer.htm">Fulvio Senore</a> (prototype of mozilla plugin)</li>
+ <li>León Moctezuma (Summer of Code 2007 developer)</li>
</ul>
<p><a href="http://sourceforge.net"><img
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-05-01 23:11:05
|
Revision: 161
http://freepv.svn.sourceforge.net/freepv/?rev=161&view=rev
Author: brunopostle
Date: 2009-05-01 23:11:03 +0000 (Fri, 01 May 2009)
Log Message:
-----------
Update ChangeLog for 3.0.0 release
Modified Paths:
--------------
freepv/trunk/ChangeLog
Modified: freepv/trunk/ChangeLog
===================================================================
--- freepv/trunk/ChangeLog 2009-03-08 22:41:01 UTC (rev 160)
+++ freepv/trunk/ChangeLog 2009-05-01 23:11:03 UTC (rev 161)
@@ -1,3 +1,30 @@
+2009-03-08 22:41 brunopostle
+
+ * CMakeScripts/FindFREEGLUT.cmake: Use glut if freeglut not
+ available (Philippe Didier)
+
+2009-02-22 22:50 brunopostle
+
+ * CMakeLists.txt: Bump version to 0.3.0 for beta release.
+
+2009-02-22 22:30 brunopostle
+
+ * CMakeLists.txt, CMakeScripts/FindFREEGLUT.cmake,
+ CMakeScripts/FindGECKO.cmake, CMakeScripts/FindJPEG.cmake,
+ CMakeScripts/FindXF86VM.cmake, CMakeScripts/FindZLIB.cmake,
+ src/CMakeLists.txt, src/config.h.in.cmake,
+ src/freepv-mozilla/CMakeLists.txt, src/freepv-mozilla/plugin.cpp,
+ src/freepv-mozilla/plugin.h, src/freepv-mozilla/plugin_unix.cpp,
+ src/freepv-mozilla/plugin_windows.cpp,
+ src/freepv-mozilla/resource.h, src/libfreepv/CMakeLists.txt,
+ src/libfreepv/Parameters.cpp, src/libfreepv/Parameters.h,
+ testcases/good/test.html, testcases/good/test_cube.html: Unify
+ mixed line-endings in text files
+
+2009-02-22 11:05 brunopostle
+
+ * ChangeLog: update ChangeLog
+
2009-02-22 10:59 brunopostle
* src/libfreepv/QTVRDecoder.cpp: Don't read past EOF patch #2225655
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-03-08 22:41:08
|
Revision: 160
http://freepv.svn.sourceforge.net/freepv/?rev=160&view=rev
Author: brunopostle
Date: 2009-03-08 22:41:01 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
Use glut if freeglut not available (Philippe Didier)
Modified Paths:
--------------
freepv/trunk/CMakeScripts/FindFREEGLUT.cmake
Modified: freepv/trunk/CMakeScripts/FindFREEGLUT.cmake
===================================================================
--- freepv/trunk/CMakeScripts/FindFREEGLUT.cmake 2009-02-22 22:50:10 UTC (rev 159)
+++ freepv/trunk/CMakeScripts/FindFREEGLUT.cmake 2009-03-08 22:41:01 UTC (rev 160)
@@ -14,6 +14,9 @@
FIND_LIBRARY(FREEGLUT_LIBRARY NAMES freeglut_static PATH ${CMAKE_LIBRARY_PATH} $ENV{lib})
ELSE(WIN32)
FIND_PATH(FREEGLUT_INCLUDE_DIR GL/freeglut.h /usr/include /usr/local/include)
+ IF(NOT FREEGLUT_INCLUDE_DIR)
+ FIND_PATH(FREEGLUT_INCLUDE_DIR GL/glut.h /usr/include /usr/local/include)
+ ENDIF(NOT FREEGLUT_INCLUDE_DIR)
FIND_LIBRARY( FREEGLUT_LIBRARY NAMES freeglut glut
/usr/lib
/usr/local/lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-02-22 22:50:12
|
Revision: 159
http://freepv.svn.sourceforge.net/freepv/?rev=159&view=rev
Author: brunopostle
Date: 2009-02-22 22:50:10 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Bump version to 0.3.0 for beta release.
Modified Paths:
--------------
freepv/trunk/CMakeLists.txt
Modified: freepv/trunk/CMakeLists.txt
===================================================================
--- freepv/trunk/CMakeLists.txt 2009-02-22 22:30:11 UTC (rev 158)
+++ freepv/trunk/CMakeLists.txt 2009-02-22 22:50:10 UTC (rev 159)
@@ -44,7 +44,7 @@
# set version
set(V_MAJOR 0)
-set(V_MINOR 2)
+set(V_MINOR 3)
set(V_PATCH 0)
# set destination dirs relative to PREFIX
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-02-22 11:06:05
|
Revision: 157
http://freepv.svn.sourceforge.net/freepv/?rev=157&view=rev
Author: brunopostle
Date: 2009-02-22 11:05:56 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
freepv/trunk/ChangeLog
Modified: freepv/trunk/ChangeLog
===================================================================
--- freepv/trunk/ChangeLog 2009-02-22 10:59:11 UTC (rev 156)
+++ freepv/trunk/ChangeLog 2009-02-22 11:05:56 UTC (rev 157)
@@ -1,3 +1,212 @@
+2009-02-22 10:59 brunopostle
+
+ * src/libfreepv/QTVRDecoder.cpp: Don't read past EOF patch #2225655
+ (Tom Sharpless)
+ (merged from branch_leonox)
+
+2009-02-22 10:56 brunopostle
+
+ * CMakeLists.txt, src/config.h.in.cmake,
+ src/freepv-glut/freepv-glut.cpp,
+ src/freepv-glut/glut_platform.cpp,
+ src/freepv-glx/glx_platform.cpp, src/freepv-glx/glx_platform.h:
+ re-apply svn116 & svn117 (Pablo d'Angelo):
+ fixed include problems with GL/glut.h, do not require header
+ files
+ for video mode switching, currently unused anyway.
+ abort compilation if no glut has been found
+
+2008-10-15 14:18 leonox
+
+ * AUTHORS, CMakeLists.txt, CMakeScripts/FindGECKO.cmake,
+ CMakeScripts/FindXF86VM.cmake, INSTALL, Makefile.am,
+ Makefile.cvs, README, config.guess, config.sub, configure.in,
+ depcomp, freepv.kdevelop, install-sh, libtool, ltmain.sh,
+ missing, mkinstalldirs, src/CMakeLists.txt, src/Makefile.am,
+ src/config.h.in.cmake, src/freepv-glut/CMakeLists.txt,
+ src/freepv-glut/Makefile.am, src/freepv-glut/freepv-glut.cpp,
+ src/freepv-glut/freepv-glut.desktop,
+ src/freepv-glut/glut_platform.cpp, src/freepv-glx/CMakeLists.txt,
+ src/freepv-glx/Makefile.am, src/freepv-glx/glx_platform.cpp,
+ src/freepv-glx/glx_platform.h, src/freepv-glx/main.cpp,
+ src/freepv-mozilla/CMakeLists.txt,
+ src/freepv-mozilla/Makefile.am, src/freepv-mozilla/plugin.cpp,
+ src/freepv-mozilla/plugin_unix.cpp,
+ src/freepv-mozilla/plugin_windows.cpp, src/freepv.sln,
+ src/libfreepv/Action.cpp, src/libfreepv/Action.h,
+ src/libfreepv/Behavior.cpp, src/libfreepv/Behavior.h,
+ src/libfreepv/CMakeLists.txt, src/libfreepv/Camera.cpp,
+ src/libfreepv/Camera.h, src/libfreepv/Controller.h,
+ src/libfreepv/Error.cpp, src/libfreepv/Error.h,
+ src/libfreepv/EventProcessor.cpp, src/libfreepv/EventProcessor.h,
+ src/libfreepv/Events.h, src/libfreepv/Image.cpp,
+ src/libfreepv/Image.h, src/libfreepv/Makefile.am,
+ src/libfreepv/Math, src/libfreepv/Math/Matrix4.cpp,
+ src/libfreepv/Math/Matrix4.h, src/libfreepv/Math/quaternion.cpp,
+ src/libfreepv/Math/quaternion.h, src/libfreepv/NodeElement.cpp,
+ src/libfreepv/NodeElement.h, src/libfreepv/OpenGLRenderer.cpp,
+ src/libfreepv/OpenGLRenderer.h, src/libfreepv/PanoViewer.cpp,
+ src/libfreepv/PanoViewer.h, src/libfreepv/Parameters.cpp,
+ src/libfreepv/Parameters.h, src/libfreepv/QTVRDecoder.cpp,
+ src/libfreepv/Renderer.h, src/libfreepv/SPiVparser.cpp,
+ src/libfreepv/SPiVparser.h, src/libfreepv/Scene.cpp,
+ src/libfreepv/Scene.h, src/libfreepv/SceneElement.cpp,
+ src/libfreepv/SceneElement.h, src/libfreepv/Subject.cpp,
+ src/libfreepv/Subject.h, src/libfreepv/Utils,
+ src/libfreepv/Utils/getPath.h,
+ src/libfreepv/Utils/signatures.cpp,
+ src/libfreepv/Utils/signatures.h,
+ src/libfreepv/Utils/stringID.cpp, src/libfreepv/Utils/stringID.h,
+ src/libfreepv/XMLparser.cpp, src/libfreepv/XMLparser.h,
+ src/libfreepv/imageReader.cpp, src/libfreepv/imageReader.h,
+ src/libfreepv/pngReader.cpp, src/libfreepv/pngReader.h,
+ src/utils/CMakeLists.txt, src/utils/Makefile.am, testcases/bad,
+ testcases/bad/34632x342-pixels.mov, testcases/bad/ftyp-atom.mov,
+ testcases/good/spiv, testcases/good/spiv/GNU.png,
+ testcases/good/spiv/cubeYuval.htm,
+ testcases/good/spiv/cubeYuval.jpg,
+ testcases/good/spiv/global.xml, testcases/good/spiv/license.txt,
+ testcases/good/spiv/mini.xml,
+ testcases/good/spiv/sphereYuval.jpg,
+ testcases/good/spiv/tuxi.png: Merged branch_leonox into the
+ trunk.
+
+2007-07-06 06:20 dangelo
+
+ * src/freepv-glut/freepv-glut.cpp: abort compilation if no glut has
+ been found
+
+2007-07-06 06:11 dangelo
+
+ * CMakeLists.txt, src/config.h.in.cmake,
+ src/freepv-glut/glut_platform.cpp,
+ src/freepv-glx/glx_platform.cpp, src/freepv-glx/glx_platform.h:
+ fixed include problems with GL/glut.h, do not require header
+ files
+ for video mode switching, currently unused anyway.
+
+2007-06-29 06:17 Leonox
+
+ * src/libfreepv/Parameters.cpp: Parameter.cpp... this file was in
+ the branch...
+
+2007-05-25 00:05 leonox
+
+ * CMakeLists.txt, CMakeScripts/FindGECKO.cmake, src/CMakeLists.txt,
+ src/config.h.in.cmake, src/freepv-glut/freepv-glut.cpp,
+ src/freepv-glx/CMakeLists.txt, src/freepv-glx/main.cpp,
+ src/freepv-mozilla/CMakeLists.txt, src/freepv-mozilla/npplat.h,
+ src/freepv-mozilla/plugin_unix.cpp, src/libfreepv/Parameters.cpp:
+ CMakeLists.txt for freepv-mozilla and freepv-glx, both work just
+ under Unix.
+ Parameters.cpp modified.
+ freepv-glut.cpp modified.
+ glx main.cpp modified.
+
+2007-05-18 21:35 dangelo
+
+ * CMakeLists.txt, TODO, freepv.kdevelop, src/config.h.in.cmake:
+ resolved conflict with my local cmake defines
+
+2007-05-18 05:04 Leonox
+
+ * CMakeLists.txt, CMakeScripts, CMakeScripts/FindFREEGLUT.cmake,
+ CMakeScripts/FindJPEG.cmake, CMakeScripts/FindZLIB.cmake,
+ src/config.h.in.cmake, src/freepv-glut/CMakeLists.txt: Added some
+ cmake scripts to look for libraries, to use them or not there is
+ and option; under windows the scripts look for the libraries in
+ the environment variables lib, include, cmake_library_path and
+ cmake_include_path.
+ Also fixed problem in setting a variable for sys/time.h inside of
+ config.h.
+
+2007-04-26 13:14 dangelo
+
+ * ., CMakeLists.txt, src/CMakeLists.txt, src/config.h.in.cmake,
+ src/freepv-glut/CMakeLists.txt, src/libfreepv/CMakeLists.txt:
+ added initial CMake (v 2.4) based build system. Tested with MSVC
+ 2003
+
+2006-12-07 14:23 dangelo
+
+ * src/libfreepv/PanoViewer.cpp: bugfix: standalone viewer could not
+ open any files. (used == instead of = :-(
+
+2006-12-01 23:42 dangelo
+
+ * ChangeLog, src/freepv-glx/glx_platform.cpp,
+ src/freepv-mozilla/plugin_unix.cpp, src/libfreepv/Controller.h,
+ src/libfreepv/Image.cpp, src/libfreepv/JpegReader.cpp,
+ src/libfreepv/OpenGLRenderer.cpp, src/libfreepv/PanoViewer.cpp,
+ src/libfreepv/PanoViewer.h, src/libfreepv/Platform.h,
+ src/libfreepv/QTVRDecoder.cpp, src/libfreepv/Renderer.h: minor
+ code cleanup, remove some commented code, fixed most warnings
+
+2006-12-01 22:45 dangelo
+
+ * README, src/libfreepv/PanoViewer.cpp, src/libfreepv/PanoViewer.h:
+ use mime types to detect QTVR vs JPEG, and only fall back to
+ extension if an
+ unknown mime type is encountered
+
+2006-11-30 23:06 dangelo
+
+ * src/freepv-mozilla/plugin_unix.cpp: modified unix plugin name to
+ include QuickTime. Some webpages, like
+ http://homepage.mac.com/wkaemena/FSPanos/Menu352.html check the
+ plugin name
+ during quicktime detection
+
+2006-10-27 18:06 dangelo
+
+ * src/freepv-mozilla/plugin_windows.cpp,
+ src/libfreepv/PanoViewer.cpp, src/libfreepv/Platform.h:
+ Platform::SetTimer() is now a one shot timer. Modified windows
+ plugin to use Fulvios immediate PostMessage() idea.
+
+2006-10-27 18:04 dangelo
+
+ * src/freepv-mozilla/freepv.rc: added pangeaVR mime types to
+ windows plugin
+
+2006-10-27 18:04 dangelo
+
+ * configure.in: added -Wall to debug build
+
+2006-10-24 07:46 dangelo
+
+ * src/libfreepv/OpenGLRenderer.cpp: bugfix: display all faces of a
+ cubic panorama when loading single cube faces.
+
+2006-10-21 21:12 dangelo
+
+ * src/freepv-mozilla/plugin_unix.cpp: added application/quicktime
+ mime type
+
+2006-10-18 12:41 dangelo
+
+ * src/freepv-mozilla/plugin_windows.cpp, testcases/good/test.html:
+ windows mozilla plugin: repaint immediately after receiving mouse
+ events
+
+2006-10-16 20:59 dangelo
+
+ * src/freepv-glut/freepv-glut.vcproj,
+ src/freepv-glut/glut_platform.cpp,
+ src/freepv-mozilla/FreePV.vcproj, src/libfreepv/QTVRDecoder.cpp,
+ src/libfreepv/libfreepv.vcproj, src/msvc, src/msvc/config.h:
+ added special config.h file for MSVC build
+
+2006-10-16 20:32 dangelo
+
+ * configure.in, src/freepv-glut/Makefile.am,
+ src/freepv-glut/freepv-glut.cpp,
+ src/freepv-glut/glut_platform.cpp,
+ src/freepv-glut/glut_platform.h, src/freepv-mozilla/Makefile.am,
+ src/libfreepv/Controller.h, src/libfreepv/OpenGLRenderer.cpp:
+ zoom in/out with up/down keys (glut cannot detect single shift
+ and ctrl keys..)
+
2006-10-16 19:21 dangelo
* freepv/trunk/src/freepv-glut/freepv-glut.cpp,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-02-22 10:59:12
|
Revision: 156
http://freepv.svn.sourceforge.net/freepv/?rev=156&view=rev
Author: brunopostle
Date: 2009-02-22 10:59:11 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
Don't read past EOF patch #2225655 (Tom Sharpless)
(merged from branch_leonox)
Modified Paths:
--------------
freepv/trunk/src/libfreepv/QTVRDecoder.cpp
Modified: freepv/trunk/src/libfreepv/QTVRDecoder.cpp
===================================================================
--- freepv/trunk/src/libfreepv/QTVRDecoder.cpp 2009-02-22 10:56:20 UTC (rev 155)
+++ freepv/trunk/src/libfreepv/QTVRDecoder.cpp 2009-02-22 10:59:11 UTC (rev 156)
@@ -280,6 +280,11 @@
}
m_mainFile = gFile;
+ // get file size for EOF test
+ size_t filepos = ftell( gFile );
+ fseek( gFile, 0, SEEK_END );
+ size_t filesize = ftell( gFile );
+ fseek( gFile, filepos, SEEK_SET );
/*************************/
/* RECURSE THROUGH ATOMS */
@@ -287,7 +292,8 @@
do
{
atomSize = ReadMovieAtom();
- }while(atomSize > 0);
+ }while(atomSize > 0
+ && ftell( gFile ) < filesize );
if (m_error != "") {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2009-02-22 10:56:24
|
Revision: 155
http://freepv.svn.sourceforge.net/freepv/?rev=155&view=rev
Author: brunopostle
Date: 2009-02-22 10:56:20 +0000 (Sun, 22 Feb 2009)
Log Message:
-----------
re-apply svn116 & svn117 (Pablo d'Angelo):
fixed include problems with GL/glut.h, do not require header files
for video mode switching, currently unused anyway.
abort compilation if no glut has been found
Modified Paths:
--------------
freepv/trunk/CMakeLists.txt
freepv/trunk/src/config.h.in.cmake
freepv/trunk/src/freepv-glut/freepv-glut.cpp
freepv/trunk/src/freepv-glut/glut_platform.cpp
freepv/trunk/src/freepv-glx/glx_platform.cpp
freepv/trunk/src/freepv-glx/glx_platform.h
Modified: freepv/trunk/CMakeLists.txt
===================================================================
--- freepv/trunk/CMakeLists.txt 2009-01-02 17:43:54 UTC (rev 154)
+++ freepv/trunk/CMakeLists.txt 2009-02-22 10:56:20 UTC (rev 155)
@@ -24,6 +24,7 @@
project (FreePV)
include(CheckFunctionExists)
+if(WIN32)
IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
MESSAGE(FATAL_ERROR "CMake generation for freepv is not allowed within the source directory!
Remove the CMakeCache.txt file and try again from another folder, e.g.:
@@ -35,6 +36,7 @@
cmake ../branch_leonox
")
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+endif(WIN32)
#Check requiered cmake version
cmake_minimum_required(VERSION 2.4.0)
@@ -133,6 +135,7 @@
CHECK_INCLUDE_FILE(GL/freeglut.h HAVE_FREEGLUT_H)
CHECK_INCLUDE_FILE(GL/glut.h HAVE_GLUT_H)
CHECK_INCLUDE_FILE(GLUT/glut.h HAVE_OSXGLUT_H)
+ CHECK_INCLUDE_FILE(X11/extensions/xf86vmode.h HAVE_XF86VMODE_H)
endif(WIN32)
# create config.h file
@@ -154,6 +157,9 @@
"/testcases/"
"/cmake_install\\\\.cmake"
"/CMakeCache.txt$"
+"/CMakeOutput.log$"
+"/CPackConfig.cmake$"
+"/CPackSourceConfig.cmake$"
"\\\\.dir/"
"\\\\.tar\\\\.gz$"
"\\\\.tar\\\\.Z$"
Modified: freepv/trunk/src/config.h.in.cmake
===================================================================
--- freepv/trunk/src/config.h.in.cmake 2009-01-02 17:43:54 UTC (rev 154)
+++ freepv/trunk/src/config.h.in.cmake 2009-02-22 10:56:20 UTC (rev 155)
@@ -15,6 +15,9 @@
/* Define to 1 if X11 was found */
#cmakedefine MOZ_X11 1
+/* Define to 1 if XF86vmode.h include was found */
+#cmakedefine HAVE_XF86VMODE_H 1
+
/* Define to 1 if you have are under Unix */
#cmakedefine XP_UNIX 1
Modified: freepv/trunk/src/freepv-glut/freepv-glut.cpp
===================================================================
--- freepv/trunk/src/freepv-glut/freepv-glut.cpp 2009-01-02 17:43:54 UTC (rev 154)
+++ freepv/trunk/src/freepv-glut/freepv-glut.cpp 2009-02-22 10:56:20 UTC (rev 155)
@@ -33,8 +33,10 @@
#include <GLUT/glut.h>
#elif defined HAVE_FREEGLUT_H
#include <GL/freeglut.h>
+#elif defined HAVE_GLUT_H
+#include <GL/glut.h>
#else
-#include <GL/glut.h>
+#error "GLUT or freeglut not found, and configure (or cmake) checks failed"
#endif
#include <vector>
Modified: freepv/trunk/src/freepv-glut/glut_platform.cpp
===================================================================
--- freepv/trunk/src/freepv-glut/glut_platform.cpp 2009-01-02 17:43:54 UTC (rev 154)
+++ freepv/trunk/src/freepv-glut/glut_platform.cpp 2009-02-22 10:56:20 UTC (rev 155)
@@ -30,10 +30,15 @@
#ifdef _WIN32
#define FREEGLUT_STATIC
#endif
+
#ifdef HAVE_OSXGLUT_H
#include <GLUT/glut.h>
+#elif defined HAVE_FREEGLUT_H
+#include <GL/freeglut.h>
+#elif defined HAVE_GLUT_H
+#include <GL/glut.h>
#else
-#include <GL/freeglut.h>
+#error "GLUT automake/cmake check failed"
#endif
#ifdef HAVE_GETTIMEOFDAY
Modified: freepv/trunk/src/freepv-glx/glx_platform.cpp
===================================================================
--- freepv/trunk/src/freepv-glx/glx_platform.cpp 2009-01-02 17:43:54 UTC (rev 154)
+++ freepv/trunk/src/freepv-glx/glx_platform.cpp 2009-02-22 10:56:20 UTC (rev 155)
@@ -224,8 +224,10 @@
int dpyWidth, dpyHeight;
int i;
int glxMajorVersion, glxMinorVersion;
+#ifdef HAVE_XF86VMODE_H
int vidModeMajorVersion, vidModeMinorVersion;
XF86VidModeModeInfo **modes;
+#endif
int modeNum;
int bestMode;
Atom wmDelete;
@@ -238,6 +240,7 @@
/* get a connection */
m_glwin.dpy = XOpenDisplay(0);
m_glwin.screen = DefaultScreen(m_glwin.dpy);
+#ifdef HAVE_XF86VMODE_H
XF86VidModeQueryVersion(m_glwin.dpy, &vidModeMajorVersion,
&vidModeMinorVersion);
printf("XF86VidModeExtension-Version %d.%d\n", vidModeMajorVersion,
@@ -253,6 +256,7 @@
bestMode = i;
}
}
+#endif
/* get an appropriate visual */
vi = glXChooseVisual(m_glwin.dpy, m_glwin.screen, attrListDbl);
if (vi == NULL)
@@ -274,6 +278,7 @@
m_glwin.attr.colormap = cmap;
m_glwin.attr.border_pixel = 0;
+#ifdef HAVE_XF86VMODE_H
if (m_glwin.fs)
{
XF86VidModeSwitchToMode(m_glwin.dpy, m_glwin.screen, modes[bestMode]);
@@ -300,6 +305,7 @@
}
else
{
+#endif
/* create a window in window mode*/
m_glwin.attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask |
ButtonReleaseMask | ButtonMotionMask | StructureNotifyMask | PointerMotionMask;
@@ -312,7 +318,10 @@
XSetStandardProperties(m_glwin.dpy, m_glwin.win, title,
title, None, NULL, 0, NULL);
XMapRaised(m_glwin.dpy, m_glwin.win);
+#ifdef HAVE_XF86VMODE_H
}
+#endif
+
/* connect the glx-context to the window */
glXMakeCurrent(m_glwin.dpy, m_glwin.win, m_glwin.ctx);
XGetGeometry(m_glwin.dpy, m_glwin.win, &winDummy, &m_glwin.x, &m_glwin.y,
@@ -364,11 +373,13 @@
m_glwin.ctx = NULL;
}
/* switch back to original desktop resolution if we were in fs */
+#ifdef HAVE_XF86VMODE_H
if (m_glwin.fs)
{
XF86VidModeSwitchToMode(m_glwin.dpy, m_glwin.screen, &m_glwin.deskMode);
XF86VidModeSetViewPort(m_glwin.dpy, m_glwin.screen, 0, 0);
}
+#endif
XCloseDisplay(m_glwin.dpy);
}
Modified: freepv/trunk/src/freepv-glx/glx_platform.h
===================================================================
--- freepv/trunk/src/freepv-glx/glx_platform.h 2009-01-02 17:43:54 UTC (rev 154)
+++ freepv/trunk/src/freepv-glx/glx_platform.h 2009-02-22 10:56:20 UTC (rev 155)
@@ -32,7 +32,9 @@
#include <GL/glx.h>
#include <GL/gl.h>
#include <GL/glu.h>
+#ifdef HAVE_XF86VMODE_H
#include <X11/extensions/xf86vmode.h>
+#endif
#include <X11/keysym.h>
@@ -71,7 +73,9 @@
GLXContext ctx;
XSetWindowAttributes attr;
bool fs;
+#ifdef HAVE_XF86VMODE_H
XF86VidModeModeInfo deskMode;
+#endif
int x, y;
unsigned int width, height;
unsigned int depth;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <le...@us...> - 2009-01-02 17:43:59
|
Revision: 154
http://freepv.svn.sourceforge.net/freepv/?rev=154&view=rev
Author: leonox
Date: 2009-01-02 17:43:54 +0000 (Fri, 02 Jan 2009)
Log Message:
-----------
Added the option to use glut instead of freeglut (need to test)
Changed $Revision 19$ to $Revision$ in PanoViewer.cpp
Revision Links:
--------------
http://freepv.svn.sourceforge.net/freepv/?rev=19&view=rev
Modified Paths:
--------------
freepv/branches/branch_leonox/CMakeLists.txt
freepv/branches/branch_leonox/src/freepv-glut/CMakeLists.txt
freepv/branches/branch_leonox/src/libfreepv/PanoViewer.cpp
Modified: freepv/branches/branch_leonox/CMakeLists.txt
===================================================================
--- freepv/branches/branch_leonox/CMakeLists.txt 2008-11-13 23:12:20 UTC (rev 153)
+++ freepv/branches/branch_leonox/CMakeLists.txt 2009-01-02 17:43:54 UTC (rev 154)
@@ -68,7 +68,10 @@
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
#Include MACROS
-include(CheckIncludeFile)
+include(CheckIncludeFile)
+
+#Options
+OPTION(USE_FREEGLUT "freeglut is a completely OpenSourced alternative to glut" ON)
#CFLAGS
#Position Independent Code (PIC) is needed by shared libraries
@@ -85,8 +88,14 @@
#########################################################################
find_package(ZLIB REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(FREEGLUT REQUIRED)
+find_package(JPEG REQUIRED)
+if(USE_FREEGLUT)
+ MESSAGE("Using FREEGLUT")
+ find_package(FREEGLUT REQUIRED)
+else(USE_FREEGLUT)
+ MESSAGE("Using GLUT")
+ find_package(GLUT REQUIRED)
+endif(USE_FREEGLUT)
find_package(OpenGL REQUIRED)
find_package(X11 REQUIRED)
find_package(GECKO REQUIRED)
@@ -98,14 +107,21 @@
# check for gettimeofday
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
+
+# decide which glut include directory to use
+if(USE_FREEGLUT)
+ set(FINAL_GLUT_INCLUDE_DIR ${FREEGLUT_INCLUDE_DIR})
+else(USE_FREEGLUT)
+ set(FINAL_GLUT_INCLUDE_DIR ${GLUT_INCLUDE_DIR})
+endif(USE_FREEGLUT)
# set compiler flags and include directories
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${ZLIB_INCLUDE_DIR}
${JPEG_INCLUDE_DIR}
- ${OPENGL_INCLUDE_DIR}
- ${FREEGLUT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_DIR}
+ ${FINAL_GLUT_INCLUDE_DIR}
${X11_INCLUDE_DIR}
${GECKO_INCLUDE_DIR}
${LIBXML2_INCLUDE_DIR}
@@ -130,11 +146,15 @@
set(MOZ_X11 1)
endif(X11_FOUND)
set(XP_UNIX 1)
- CHECK_INCLUDE_FILE(sys/time.h HAVE_GETTIMEOFDAY)
- set(CMAKE_REQUIRED_INCLUDES ${FREEGLUT_INCLUDE_DIR})
- CHECK_INCLUDE_FILE(GL/freeglut.h HAVE_FREEGLUT_H)
+ CHECK_INCLUDE_FILE(sys/time.h HAVE_GETTIMEOFDAY)
+
+ set(CMAKE_REQUIRED_INCLUDES ${FINAL_GLUT_INCLUDE_DIR})
+ if(USE_FREEGLUT)
+ CHECK_INCLUDE_FILE(GL/freeglut.h HAVE_FREEGLUT_H)
+ endif(USE_FREEGLUT)
CHECK_INCLUDE_FILE(GL/glut.h HAVE_GLUT_H)
- CHECK_INCLUDE_FILE(GLUT/glut.h HAVE_OSXGLUT_H)
+ CHECK_INCLUDE_FILE(GLUT/glut.h HAVE_OSXGLUT_H)
+
endif(WIN32)
# create config.h file
Modified: freepv/branches/branch_leonox/src/freepv-glut/CMakeLists.txt
===================================================================
--- freepv/branches/branch_leonox/src/freepv-glut/CMakeLists.txt 2008-11-13 23:12:20 UTC (rev 153)
+++ freepv/branches/branch_leonox/src/freepv-glut/CMakeLists.txt 2009-01-02 17:43:54 UTC (rev 154)
@@ -2,17 +2,20 @@
# Make sure the compiler can find include files from our freepv library.
INCLUDE_DIRECTORIES(${FreePV_SOURCE_DIR}/src/libfreepv)
-# Make sure the linker can find the Hello library once it is built.
-LINK_DIRECTORIES(${FreePV_BINARY_DIR}/Hello)
-
-# Add executable called "helloDemo" that is built from the source files
-# "demo.cxx" and "demo_b.cxx". The extensions are automatically found.
+# Add executable called "freepv-glut" that is built from the source files
+# "freepv-glut.cpp" and "glut_platform.cpp". The extensions are automatically found.
ADD_EXECUTABLE(freepv-glut freepv-glut.cpp glut_platform.cpp)
-# Link the executable to the Hello library.
+# Link the executable to the libraries.
+if(USE_FREEGLUT)
+ set(FINAL_GLUT_LIBRARIES ${FREEGLUT_LIBRARIES})
+else(USE_FREEGLUT)
+ set(FINAL_GLUT_LIBRARIES ${GLUT_LIBRARIES})
+endif(USE_FREEGLUT)
+
TARGET_LINK_LIBRARIES(freepv-glut freepv
${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${LIBXML2_LIBRARIES}
- ${OPENGL_LIBRARIES} ${FREEGLUT_LIBRARIES} ${PNG_LIBRARIES})
+ ${OPENGL_LIBRARIES} ${PNG_LIBRARIES} ${FINAL_GLUT_LIBRARIES})
INSTALL(TARGETS freepv-glut DESTINATION bin)
INSTALL(FILES freepv-glut.desktop DESTINATION share/applications)
Modified: freepv/branches/branch_leonox/src/libfreepv/PanoViewer.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/PanoViewer.cpp 2008-11-13 23:12:20 UTC (rev 153)
+++ freepv/branches/branch_leonox/src/libfreepv/PanoViewer.cpp 2009-01-02 17:43:54 UTC (rev 154)
@@ -45,7 +45,7 @@
m_currentCubeFaceDownload(0)
{
- std::cerr << "Starting freepv, revision: $Revision$ " << std::endl;
+ std::cerr << "Starting freepv, revision: $Revision$" << std::endl;
DEBUG_TRACE("");
m_currentCube=0;
m_scene = new Scene();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-11-13 23:12:24
|
Revision: 153
http://freepv.svn.sourceforge.net/freepv/?rev=153&view=rev
Author: brunopostle
Date: 2008-11-13 23:12:20 +0000 (Thu, 13 Nov 2008)
Log Message:
-----------
remove some more files from the tarball
Modified Paths:
--------------
freepv/branches/branch_leonox/CMakeLists.txt
Modified: freepv/branches/branch_leonox/CMakeLists.txt
===================================================================
--- freepv/branches/branch_leonox/CMakeLists.txt 2008-11-06 23:25:48 UTC (rev 152)
+++ freepv/branches/branch_leonox/CMakeLists.txt 2008-11-13 23:12:20 UTC (rev 153)
@@ -156,6 +156,9 @@
"/testcases/"
"/cmake_install\\\\.cmake"
"/CMakeCache.txt$"
+"/CMakeOutput.log$"
+"/CPackConfig.cmake$"
+"/CPackSourceConfig.cmake$"
"\\\\.dir/"
"\\\\.tar\\\\.gz$"
"\\\\.tar\\\\.Z$"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-11-06 23:25:56
|
Revision: 152
http://freepv.svn.sourceforge.net/freepv/?rev=152&view=rev
Author: brunopostle
Date: 2008-11-06 23:25:48 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
in-source build is necessary for straightforward linux packaging
Modified Paths:
--------------
freepv/branches/branch_leonox/CMakeLists.txt
Modified: freepv/branches/branch_leonox/CMakeLists.txt
===================================================================
--- freepv/branches/branch_leonox/CMakeLists.txt 2008-11-06 23:23:04 UTC (rev 151)
+++ freepv/branches/branch_leonox/CMakeLists.txt 2008-11-06 23:25:48 UTC (rev 152)
@@ -24,6 +24,7 @@
project (FreePV)
include(CheckFunctionExists)
+if(WIN32)
IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
MESSAGE(FATAL_ERROR "CMake generation for freepv is not allowed within the source directory!
Remove the CMakeCache.txt file and try again from another folder, e.g.:
@@ -35,6 +36,7 @@
cmake ../branch_leonox
")
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+endif(WIN32)
#Check requiered cmake version
cmake_minimum_required(VERSION 2.4.0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-11-06 23:23:10
|
Revision: 151
http://freepv.svn.sourceforge.net/freepv/?rev=151&view=rev
Author: brunopostle
Date: 2008-11-06 23:23:04 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Don't read past EOF patch #2225655 (Tom Sharpless)
Modified Paths:
--------------
freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp
Modified: freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp 2008-10-15 14:18:53 UTC (rev 150)
+++ freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp 2008-11-06 23:23:04 UTC (rev 151)
@@ -280,6 +280,11 @@
}
m_mainFile = gFile;
+ // get file size for EOF test
+ size_t filepos = ftell( gFile );
+ fseek( gFile, 0, SEEK_END );
+ size_t filesize = ftell( gFile );
+ fseek( gFile, filepos, SEEK_SET );
/*************************/
/* RECURSE THROUGH ATOMS */
@@ -287,7 +292,8 @@
do
{
atomSize = ReadMovieAtom();
- }while(atomSize > 0);
+ }while(atomSize > 0
+ && ftell( gFile ) < filesize );
if (m_error != "") {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <le...@us...> - 2008-10-12 13:47:01
|
Revision: 149
http://freepv.svn.sourceforge.net/freepv/?rev=149&view=rev
Author: leonox
Date: 2008-10-12 13:46:52 +0000 (Sun, 12 Oct 2008)
Log Message:
-----------
Some lines to CMakeList.txt were added to not allow in-source builds.
Modified Paths:
--------------
freepv/branches/branch_leonox/CMakeLists.txt
Modified: freepv/branches/branch_leonox/CMakeLists.txt
===================================================================
--- freepv/branches/branch_leonox/CMakeLists.txt 2008-10-12 05:30:53 UTC (rev 148)
+++ freepv/branches/branch_leonox/CMakeLists.txt 2008-10-12 13:46:52 UTC (rev 149)
@@ -23,6 +23,18 @@
#Set the Project's Name
project (FreePV)
include(CheckFunctionExists)
+
+IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+MESSAGE(FATAL_ERROR "CMake generation for freepv is not allowed within the source directory!
+Remove the CMakeCache.txt file and try again from another folder, e.g.:
+
+ rm CMakeCache.txt
+ cd ..
+ mkdir cmake-make
+ cd cmake-make
+ cmake ../branch_leonox
+")
+ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
#Check requiered cmake version
cmake_minimum_required(VERSION 2.4.0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <le...@us...> - 2008-10-12 05:31:04
|
Revision: 148
http://freepv.svn.sourceforge.net/freepv/?rev=148&view=rev
Author: leonox
Date: 2008-10-12 05:30:53 +0000 (Sun, 12 Oct 2008)
Log Message:
-----------
signature.cpp was modiefied to be able to detect mov files with ftyp
atoms as qtvrs.
Modified Paths:
--------------
freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp
Modified: freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp 2008-07-29 00:14:35 UTC (rev 147)
+++ freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp 2008-10-12 05:30:53 UTC (rev 148)
@@ -28,26 +28,29 @@
namespace FPV{
namespace Utils{
- //JPEG Signature
+ //JPEG Signature
char jpg_size=1;
short jpg_sig[]={0xD8FF};
//PNG Signature
char png_size=4;
short png_sig[]={0x5089, 0x474E, 0x0A0D, 0x0A1A};
- //MOV Signature
- char mov_size=4;
- short mov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F};
//XML Signature
char xml_size=3;
short xml_sig[]={0x3F3C, 0x6D78, 0x206C};
//DCR Signature
char dcr_size=2;
short dcr_sig[]={0x4658, 0x5249};
+ //MOV (MOOV atom) Signature
+ char mov_moov_size=4;
+ short mov_moov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F};
+ //MOV (FTYP atom) Siganture
+ char mov_ftyp_size=4;
+ short mov_ftyp_sig[]={0x0000, 0x0000, 0x7466, 0x7079};
//Signatures to check
- char sig_types_num=5;
- short* signature[]={jpg_sig,png_sig,mov_sig,xml_sig,dcr_sig};
- char sig_sizes[]={jpg_size,png_size,mov_size,xml_size,dcr_size};
+ char sig_types_num=6;
+ short* signature[]={jpg_sig,png_sig,xml_sig,dcr_sig,mov_moov_sig,mov_ftyp_sig};
+ char sig_sizes[]={jpg_size,png_size,xml_size,dcr_size,mov_moov_size,mov_ftyp_size};
const char* CheckMagicBytes(const char* filename)
{
@@ -71,7 +74,7 @@
//In case of MOV skip the first 4 bytes.
//by asigning the first 4 read bytes
//to the MOV signature
- if(type==2&&i<2) mov_sig[i]=number;
+ if(type>2&&i<2) mov_ftyp_sig[i]=mov_moov_sig[i]=number;
//The comparation is made by using a bit XOR operator
//we look for the double implication <->, so the result
@@ -99,13 +102,13 @@
if(type==0)
return("JPG");
if(type==1)
- return("PNG");
+ return("PNG");;
if(type==2)
- return("QTVR");
+ return("XML");
if(type==3)
- return("XML");
- if(type==4)
return("DCR");
+ if(type==4||type==5)
+ return("QTVR");
//In other case return Unknown
return("Unknown");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-07-29 00:14:26
|
Revision: 147
http://freepv.svn.sourceforge.net/freepv/?rev=147&view=rev
Author: brunopostle
Date: 2008-07-29 00:14:35 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Don't put rpath in binaries
Modified Paths:
--------------
freepv/branches/branch_leonox/CMakeLists.txt
Modified: freepv/branches/branch_leonox/CMakeLists.txt
===================================================================
--- freepv/branches/branch_leonox/CMakeLists.txt 2008-06-01 20:26:47 UTC (rev 146)
+++ freepv/branches/branch_leonox/CMakeLists.txt 2008-07-29 00:14:35 UTC (rev 147)
@@ -80,6 +80,7 @@
find_package(PNG REQUIRED)
find_package(XF86VM REQUIRED)
+SET(CMAKE_SKIP_BUILD_RPATH TRUE)
# check for gettimeofday
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-06-01 20:26:55
|
Revision: 146
http://freepv.svn.sourceforge.net/freepv/?rev=146&view=rev
Author: brunopostle
Date: 2008-06-01 13:26:47 -0700 (Sun, 01 Jun 2008)
Log Message:
-----------
hardy heron build requirements (Milan Kn?\195?\173?\197?\190ek)
Modified Paths:
--------------
freepv/branches/branch_leonox/README
Modified: freepv/branches/branch_leonox/README
===================================================================
--- freepv/branches/branch_leonox/README 2008-05-31 21:54:05 UTC (rev 145)
+++ freepv/branches/branch_leonox/README 2008-06-01 20:26:47 UTC (rev 146)
@@ -1,6 +1,18 @@
+Typical cmake build instructions:
+ cmake .
+ make
+ make install
+
+Bug reports and patches can be added to the freepv tracker or sent to the
+freepv-devel mailing list:
+
+http://sourceforge.net/tracker/?atid=772024&group_id=148373&func=browse
+http://sourceforge.net/mailarchive/forum.php?forum_name=freepv-devel
+
Required packages for compilation (ubuntu dapper):
+cmake
make
pkg-config
g++
@@ -13,6 +25,24 @@
x11proto-xf86vidmode-dev
libxxf86vm-dev
+ubuntu hardy heron:
+
+cmake
+make
+pkg-config
+g++
+mozilla-dev
+freeglut-dev
+zlib1g-dev
+libjpeg-dev
+libxext-dev
+libxmu-dev
+x11proto-xf86vidmode-dev
+libxxf86vm-dev
+libnspr4-dev
+libxml2-dev
+libpng12-dev
+
fedora f8:
firefox-devel
@@ -28,3 +58,18 @@
libxml2-devel
libpng-devel
+fedora f9:
+
+xulrunner-devel
+libjpeg-devel
+zlib-devel
+cmake
+pkgconfig
+gcc-c++
+libXxf86vm-devel
+freeglut-devel
+libXt-devel
+libXmu-devel
+libxml2-devel
+libpng-devel
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-05-31 21:53:58
|
Revision: 145
http://freepv.svn.sourceforge.net/freepv/?rev=145&view=rev
Author: brunopostle
Date: 2008-05-31 14:54:05 -0700 (Sat, 31 May 2008)
Log Message:
-----------
gcc-4.3.0 fixes
Modified Paths:
--------------
freepv/branches/branch_leonox/src/freepv-mozilla/plugin.cpp
freepv/branches/branch_leonox/src/libfreepv/Image.h
freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp
freepv/branches/branch_leonox/src/libfreepv/SPiVparser.cpp
freepv/branches/branch_leonox/src/libfreepv/Utils/stringID.cpp
freepv/branches/branch_leonox/src/libfreepv/XMLparser.cpp
Modified: freepv/branches/branch_leonox/src/freepv-mozilla/plugin.cpp
===================================================================
--- freepv/branches/branch_leonox/src/freepv-mozilla/plugin.cpp 2008-05-31 21:52:54 UTC (rev 144)
+++ freepv/branches/branch_leonox/src/freepv-mozilla/plugin.cpp 2008-05-31 21:54:05 UTC (rev 145)
@@ -37,6 +37,7 @@
#include <stdio.h>
+#include <cstring>
#include "plugin.h"
Modified: freepv/branches/branch_leonox/src/libfreepv/Image.h
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/Image.h 2008-05-31 21:52:54 UTC (rev 144)
+++ freepv/branches/branch_leonox/src/libfreepv/Image.h 2008-05-31 21:54:05 UTC (rev 145)
@@ -32,6 +32,7 @@
//#include <vector>
#include <string>
#include <assert.h>
+#include <cstdlib>
#include "Platform.h"
Modified: freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp 2008-05-31 21:52:54 UTC (rev 144)
+++ freepv/branches/branch_leonox/src/libfreepv/QTVRDecoder.cpp 2008-05-31 21:54:05 UTC (rev 145)
@@ -41,6 +41,7 @@
#include <math.h>
#include <errno.h>
#include <vector>
+#include <cstring>
#include <zlib.h>
Modified: freepv/branches/branch_leonox/src/libfreepv/SPiVparser.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/SPiVparser.cpp 2008-05-31 21:52:54 UTC (rev 144)
+++ freepv/branches/branch_leonox/src/libfreepv/SPiVparser.cpp 2008-05-31 21:54:05 UTC (rev 145)
@@ -26,6 +26,7 @@
#include <iostream>
#include <assert.h>
#include "Error.h"
+#include <cstring>
using namespace FPV;
Modified: freepv/branches/branch_leonox/src/libfreepv/Utils/stringID.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/Utils/stringID.cpp 2008-05-31 21:52:54 UTC (rev 144)
+++ freepv/branches/branch_leonox/src/libfreepv/Utils/stringID.cpp 2008-05-31 21:54:05 UTC (rev 145)
@@ -23,6 +23,7 @@
*/
#include "stringID.h"
+#include <cstdlib>
namespace FPV{
namespace Utils{
Modified: freepv/branches/branch_leonox/src/libfreepv/XMLparser.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/XMLparser.cpp 2008-05-31 21:52:54 UTC (rev 144)
+++ freepv/branches/branch_leonox/src/libfreepv/XMLparser.cpp 2008-05-31 21:54:05 UTC (rev 145)
@@ -24,6 +24,7 @@
#include "XMLparser.h"
#include <iostream>
+#include <cstring>
using namespace FPV;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-05-31 21:52:47
|
Revision: 144
http://freepv.svn.sourceforge.net/freepv/?rev=144&view=rev
Author: brunopostle
Date: 2008-05-31 14:52:54 -0700 (Sat, 31 May 2008)
Log Message:
-----------
gecko could be also be seamonkey or libxul...
Modified Paths:
--------------
freepv/branches/branch_leonox/CMakeScripts/FindGECKO.cmake
Modified: freepv/branches/branch_leonox/CMakeScripts/FindGECKO.cmake
===================================================================
--- freepv/branches/branch_leonox/CMakeScripts/FindGECKO.cmake 2008-05-15 22:21:10 UTC (rev 143)
+++ freepv/branches/branch_leonox/CMakeScripts/FindGECKO.cmake 2008-05-31 21:52:54 UTC (rev 144)
@@ -17,11 +17,13 @@
_MOZILLA-PLUGINLinkFlags _MOZILLA-PLUGINCflags)
PKGCONFIG(xulrunner-plugin _XULRUNNER-PLUGINIncDir _XULRUNNER-PLUGINLinkDir
_XULRUNNER-PLUGINLinkFlags _XULRUNNER-PLUGINCflags)
+ PKGCONFIG(libxul _LIBXULIncDir _LIBXULLinkDir
+ _LIBXULLinkFlags _LIBXULCflags)
PKGCONFIG(nspr _NSPRIncDir _NSPRLinkDir _NSPRLinkFlags _NSPRCflags)
FIND_PATH(GECKO_ROOT_DIR npapi.h npupp.h /usr/include/firefox /usr/local/include/firefox
- /usr/include/xulrunner /usr/include/iceape ${_XULRUNNER-PLUGINIncDir}
- ${_FIREFOX-PLUGINIncDir} ${_MOZILLA-PLUGINIncDir})
+ /usr/include/xulrunner /usr/include/seamonkey /usr/include/iceape ${_XULRUNNER-PLUGINIncDir}
+ ${_FIREFOX-PLUGINIncDir} ${_MOZILLA-PLUGINIncDir} ${_LIBXULIncDir}/stable)
FIND_PATH(GECKO_NSPR_DIR prthread.h ${GECKO_ROOT_DIR}/nspr
${_NSPRIncDir} /usr/include/nspr4 ${GECKO_ROOT_DIR})
FIND_LIBRARY( Xt_LIBRARY NAMES Xt /usr/lib /usr/local/lib )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bru...@us...> - 2008-05-15 22:22:20
|
Revision: 143
http://freepv.svn.sourceforge.net/freepv/?rev=143&view=rev
Author: brunopostle
Date: 2008-05-15 15:21:10 -0700 (Thu, 15 May 2008)
Log Message:
-----------
Add two QTVRs that fail with current freepv
Added Paths:
-----------
freepv/branches/branch_leonox/testcases/bad/
freepv/branches/branch_leonox/testcases/bad/34632x342-pixels.mov
freepv/branches/branch_leonox/testcases/bad/ftyp-atom.mov
Added: freepv/branches/branch_leonox/testcases/bad/34632x342-pixels.mov
===================================================================
(Binary files differ)
Property changes on: freepv/branches/branch_leonox/testcases/bad/34632x342-pixels.mov
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: freepv/branches/branch_leonox/testcases/bad/ftyp-atom.mov
===================================================================
(Binary files differ)
Property changes on: freepv/branches/branch_leonox/testcases/bad/ftyp-atom.mov
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <le...@us...> - 2008-04-06 11:59:39
|
Revision: 142
http://freepv.svn.sourceforge.net/freepv/?rev=142&view=rev
Author: leonox
Date: 2008-04-06 04:59:43 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp
Modified: freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp
===================================================================
--- freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp 2008-03-15 11:02:11 UTC (rev 141)
+++ freepv/branches/branch_leonox/src/libfreepv/Utils/signatures.cpp 2008-04-06 11:59:43 UTC (rev 142)
@@ -23,6 +23,7 @@
*/
#include "signatures.h"
+#include <iostream>
namespace FPV{
namespace Utils{
@@ -34,8 +35,8 @@
char png_size=4;
short png_sig[]={0x5089, 0x474E, 0x0A0D, 0x0A1A};
//MOV Signature
- char mov_size=2;
- short mov_sig[]={0x6F6D, 0x766F};
+ char mov_size=4;
+ short mov_sig[]={0x0000, 0x0000, 0x6F6D, 0x766F};
//XML Signature
char xml_size=3;
short xml_sig[]={0x3F3C, 0x6D78, 0x206C};
@@ -67,22 +68,31 @@
do{
fread(&number,2,1,p_file);
- //in case of MOV skip the first 4 bytes.
- if(type==2&&i<2)
- mov_sig[i]=number;
- //std::cerr<<"Lectura:"<<std::hex<<signature[type][i]<<std::endl;
- equal=signature[type][i++]^number;
- //std::cerr.setf( ios_base::hex );
- //std::cerr<<"Comparada con:"<<std::hex<<number<<std::endl<<std::endl;
+ //In case of MOV skip the first 4 bytes.
+ //by asigning the first 4 read bytes
+ //to the MOV signature
+ if(type==2&&i<2) mov_sig[i]=number;
- }while(!equal&&i<sig_sizes[type]);
+ //The comparation is made by using a bit XOR operator
+ //we look for the double implication <->, so the result
+ //of the XOR operation is negated.
+ equal=!(signature[type][i++]^number);
+
+ //std::cerr<<"Lecture:"<<std::hex<<signature[type][i]<<std::endl;
+ //std::cerr<<"Compared with:"<<std::hex<<number<<std::endl<<std::endl;
+ //std::cerr<<"Equal: "<<std::hex<<equal<<std::endl<<std::endl;*/
+
+ }while(equal&&i<sig_sizes[type]);
- if(!equal){
+ if(equal){
+ //The signature was found,
+ //There is no need to keep looking for...
break;
}
+ //Check next probable signature.
type++;
- }while(equal&&type<sig_types_num);
+ }while(type<sig_types_num);
fclose(p_file);
@@ -96,58 +106,12 @@
return("XML");
if(type==4)
return("DCR");
+
+ //In other case return Unknown
return("Unknown");
}
- std::string CheckMagicBytes(const char* filename, std::string type){
- FILE * p_file;
- p_file=fopen(filename, "rb");
- short number;
- short equal=0;
- char i, type_num;
-
- if(p_file==NULL){
- return "Unknown";
- }
-
- if(type=="JPG"||type=="JPEG")
- type_num = 0;
- else if(type=="PNG")
- type_num = 1;
- else if(type=="QTVR")
- type_num = 2;
- else if(type=="XML")
- type_num = 3;
- else if(type=="DCR")
- type_num = 4;
- else
- type_num = 5;
-
- i=0;
- do{
- if(type_num>4) break;
- fread(&number,2,1,p_file);
-
- //in case of MOV skip the first 4 bytes.
- if(type_num==2&&i<2)
- mov_sig[i]=number;
- //std::cerr<<"Lecture:"<<std::hex<<signature[type_num][i]<<std::endl;
- equal=signature[type_num][i++]^number;
- //std::cerr.setf( ios_base::hex );
- //std::cerr<<"Compared with:"<<std::hex<<number<<std::endl<<std::endl;
-
- }while(!equal&&i<sig_sizes[type_num]);
-
- fclose(p_file);
-
- if(!equal)
- return type;
- else
- return type="Unknown";
-
- }
-
}//Utils
}//namespace
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
