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: <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-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...> - 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. |