API tools faq
paste
Guest User

Untitled

a guest
Jul 18th, 2018
74
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.32 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur freepv-0.3.0/CMakeLists.txt freepv-0.3.0-r1/CMakeLists.txt
  2. --- freepv-0.3.0/CMakeLists.txt 2009-05-02 08:12:31.000000000 +0900
  3. +++ freepv-0.3.0-r1/CMakeLists.txt 2010-12-25 22:49:53.000000000 +0900
  4. @@ -89,7 +89,6 @@
  5. find_package(FREEGLUT REQUIRED)
  6. find_package(OpenGL REQUIRED)
  7. find_package(X11 REQUIRED)
  8. -find_package(GECKO REQUIRED)
  9. find_package(LibXml2 REQUIRED)
  10. find_package(PNG REQUIRED)
  11. find_package(XF86VM REQUIRED)
  12. @@ -107,7 +106,6 @@
  13. ${OPENGL_INCLUDE_DIR}
  14. ${FREEGLUT_INCLUDE_DIR}
  15. ${X11_INCLUDE_DIR}
  16. - ${GECKO_INCLUDE_DIR}
  17. ${LIBXML2_INCLUDE_DIR}
  18. ${PNG_INCLUDE_DIR}
  19. ${XF86VM_INCLUDE_DIR})
  20. diff -Naur freepv-0.3.0/src/CMakeLists.txt freepv-0.3.0-r1/src/CMakeLists.txt
  21. --- freepv-0.3.0/src/CMakeLists.txt 2009-05-02 08:12:31.000000000 +0900
  22. +++ freepv-0.3.0-r1/src/CMakeLists.txt 2010-12-25 22:49:53.000000000 +0900
  23. @@ -5,7 +5,6 @@
  24. add_subdirectory (freepv-glut)
  25. add_subdirectory (utils)
  26. if(UNIX)
  27. - add_subdirectory (freepv-mozilla)
  28. add_subdirectory (freepv-glx)
  29. endif(UNIX)
  30.  
  31. diff -Naur freepv-0.3.0/src/freepv-glut/glut_platform.cpp freepv-0.3.0-r1/src/freepv-glut/glut_platform.cpp
  32. --- freepv-0.3.0/src/freepv-glut/glut_platform.cpp 2009-05-02 08:12:31.000000000 +0900
  33. +++ freepv-0.3.0-r1/src/freepv-glut/glut_platform.cpp 2010-12-25 23:28:32.000000000 +0900
  34. @@ -256,7 +256,7 @@
  35.  
  36. void GLUTPlatform::glutMouseCallback(int button, int state,int x, int y) {
  37. MouseEvent mev;
  38. - printf("glutMouseCallback, button %d, state %d, pos: %d, %d\n", button, state, x, y);
  39. + // printf("glutMouseCallback, button %d, state %d, pos: %d, %d\n", button, state, x, y);
  40. mev.modifiers = convertModifiers(glutGetModifiers());
  41.  
  42. mev.pos.x=x;
  43. @@ -312,7 +312,7 @@
  44.  
  45. void GLUTPlatform::glutMouseMotionCallback(int x, int y) {
  46. MouseEvent mev;
  47. - printf("glutMouseMotion, pos: %d, %d\n", x, y);
  48. + // printf("glutMouseMotion, pos: %d, %d\n", x, y);
  49. mev.buttonNr=0;
  50. mev.down=false;
  51. mev.modifiers=m_modifiers;
  52. diff -Naur freepv-0.3.0/src/freepv-glx/glx_platform.cpp freepv-0.3.0-r1/src/freepv-glx/glx_platform.cpp
  53. --- freepv-0.3.0/src/freepv-glx/glx_platform.cpp 2009-05-02 08:12:31.000000000 +0900
  54. +++ freepv-0.3.0-r1/src/freepv-glx/glx_platform.cpp 2010-12-25 23:50:13.000000000 +0900
  55. @@ -98,7 +98,7 @@
  56. default:
  57. break;
  58. }
  59. - std::cerr<<"Type="<<event->type<<std::endl;
  60. + // std::cerr<<"Type="<<event->type<<std::endl;
  61. };
  62.  
  63. GLXPlatformStandalone::GLXPlatformStandalone(int argc, char ** argv)
  64. @@ -355,7 +355,7 @@
  65. errCode = glGetError();
  66. errString = gluErrorString(errCode);
  67. if (errCode != GL_NO_ERROR) {
  68. - DEBUG_ERROR("OpenGL Error: " << errCode << ", " << errString);
  69. + // DEBUG_ERROR("OpenGL Error: " << errCode << ", " << errString);
  70. }
  71. }
  72.  
  73. diff -Naur freepv-0.3.0/src/libfreepv/CMakeLists.txt freepv-0.3.0-r1/src/libfreepv/CMakeLists.txt
  74. --- freepv-0.3.0/src/libfreepv/CMakeLists.txt 2009-05-02 08:12:31.000000000 +0900
  75. +++ freepv-0.3.0-r1/src/libfreepv/CMakeLists.txt 2010-12-25 22:54:36.000000000 +0900
  76. @@ -14,7 +14,7 @@
  77. glutfont/freeglut_glutfont_definitions.c
  78. Math/Matrix4.cpp Math/quaternion.cpp)
  79.  
  80. -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)
  81.  
  82. -INSTALL(TARGETS freepv DESTINATION ${LIBDIR})
  83. +
  84. +
  85.  
  86. diff -Naur freepv-0.3.0/src/libfreepv/JpegReader.cpp freepv-0.3.0-r1/src/libfreepv/JpegReader.cpp
  87. --- freepv-0.3.0/src/libfreepv/JpegReader.cpp 2009-05-02 08:12:31.000000000 +0900
  88. +++ freepv-0.3.0-r1/src/libfreepv/JpegReader.cpp 2010-12-25 22:52:47.000000000 +0900
  89. @@ -174,7 +174,7 @@
  90. */
  91.  
  92. static void
  93. - jpeg_mem_src (j_decompress_ptr cinfo, JOCTET * data, size_t length)
  94. + freepv_jpeg_mem_src (j_decompress_ptr cinfo, JOCTET * data, size_t length)
  95. {
  96. mem_src_ptr src;
  97.  
  98. @@ -267,7 +267,7 @@
  99. jpeg_create_decompress(&cinfo);
  100.  
  101. /* Step 2: specify data source (eg, a file) */
  102. - jpeg_mem_src(&cinfo, buffer, buf_len);
  103. + freepv_jpeg_mem_src(&cinfo, buffer, buf_len);
  104.  
  105. /* Step 3: read file parameters with jpeg_read_header() */
  106.  
  107. diff -Naur freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp freepv-0.3.0-r1/src/libfreepv/OpenGLRenderer.cpp
  108. --- freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp 2009-05-02 08:12:31.000000000 +0900
  109. +++ freepv-0.3.0-r1/src/libfreepv/OpenGLRenderer.cpp 2010-12-25 22:49:41.000000000 +0900
  110. @@ -26,7 +26,8 @@
  111. #include <config.h>
  112.  
  113. #include <vector>
  114. -#include <math.h>
  115. +#include <cmath>
  116. +#include <cstdio>
  117.  
  118. #include "OpenGLRenderer.h"
  119. #include "Scene.h"
  120. diff -Naur freepv-0.3.0/src/libfreepv/PanoViewer.cpp freepv-0.3.0-r1/src/libfreepv/PanoViewer.cpp
  121. --- freepv-0.3.0/src/libfreepv/PanoViewer.cpp 2009-05-02 08:12:31.000000000 +0900
  122. +++ freepv-0.3.0-r1/src/libfreepv/PanoViewer.cpp 2010-12-25 23:35:02.000000000 +0900
  123. @@ -365,7 +365,8 @@
  124. //m_renderer->initElement(*pano);
  125. //m_platform->startTimer(10);
  126. m_statusMessage="viewing";
  127. - m_scene->setStatusText("QTVR successfully loaded");
  128. + // m_scene->setStatusText("QTVR successfully loaded");
  129. + m_scene->setStatusText("");
  130. changeState(STATE_VIEWING);
  131. redraw();
  132. }
  133. @@ -392,7 +393,8 @@
  134. //m_renderer->initElement(*m_currentCube);
  135. //m_platform->startTimer(10);
  136. m_statusMessage="viewing";
  137. - m_scene->setStatusText("QTVR successfully loaded");
  138. + // m_scene->setStatusText("QTVR successfully loaded");
  139. + m_scene->setStatusText("");
  140. changeState(STATE_VIEWING);
  141. redraw();
  142. } else {
  143. diff -Naur freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp freepv-0.3.0-r1/src/libfreepv/QTVRDecoder.cpp
  144. --- freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp 2009-05-02 08:12:31.000000000 +0900
  145. +++ freepv-0.3.0-r1/src/libfreepv/QTVRDecoder.cpp 2010-12-25 22:49:41.000000000 +0900
  146. @@ -42,6 +42,7 @@
  147. #include <errno.h>
  148. #include <vector>
  149. #include <cstring>
  150. +#include <cstdio>
  151.  
  152. #include <zlib.h>
  153.  
  154. diff -Naur freepv-0.3.0/src/libfreepv/SPiVparser.cpp freepv-0.3.0-r1/src/libfreepv/SPiVparser.cpp
  155. --- freepv-0.3.0/src/libfreepv/SPiVparser.cpp 2009-05-02 08:12:31.000000000 +0900
  156. +++ freepv-0.3.0-r1/src/libfreepv/SPiVparser.cpp 2010-12-25 22:49:41.000000000 +0900
  157. @@ -488,8 +488,8 @@
  158. //This method remplace the nodes that has src attributes
  159. void SPiVparser::parseNodeURL(const char* _url)
  160. {
  161. - char * aux_url=NULL;
  162. - char * url=(char*) _url;
  163. + const char * aux_url=NULL;
  164. + const char * url=(char*) _url;
  165. if(aux_url = strrchr (_url,'/'))
  166. {
  167. url=aux_url;
  168. diff -Naur freepv-0.3.0/src/libfreepv/Utils/signatures.cpp freepv-0.3.0-r1/src/libfreepv/Utils/signatures.cpp
  169. --- freepv-0.3.0/src/libfreepv/Utils/signatures.cpp 2009-05-02 08:12:31.000000000 +0900
  170. +++ freepv-0.3.0-r1/src/libfreepv/Utils/signatures.cpp 2010-12-25 22:49:41.000000000 +0900
  171. @@ -24,6 +24,7 @@
  172.  
  173. #include "signatures.h"
  174. #include <iostream>
  175. +#include <cstdio>
  176.  
  177. namespace FPV{
  178. namespace Utils{
  179. diff -Naur freepv-0.3.0/src/libfreepv/pngReader.cpp freepv-0.3.0-r1/src/libfreepv/pngReader.cpp
  180. --- freepv-0.3.0/src/libfreepv/pngReader.cpp 2009-05-02 08:12:31.000000000 +0900
  181. +++ freepv-0.3.0-r1/src/libfreepv/pngReader.cpp 2010-12-25 22:51:53.000000000 +0900
  182. @@ -135,7 +135,7 @@
  183. //Transfor grayscale images with less
  184. //than 8 bits to 8 bits
  185. if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
  186. - png_set_gray_1_2_4_to_8(p_png_struct);
  187. + png_set_expand_gray_1_2_4_to_8(p_png_struct);
  188.  
  189. //Add a full alpha channel if there is
  190. //transparency information in the tRNS chunk
  191. @@ -283,7 +283,7 @@
  192. //Transfor grayscale images with less
  193. //than 8 bits to 8 bits.
  194. if(color_t == PNG_COLOR_TYPE_GRAY && depth<8)
  195. - png_set_gray_1_2_4_to_8(p_png_struct);
  196. + png_set_expand_gray_1_2_4_to_8(p_png_struct);
  197.  
  198. //Add a full alpha channel if there is
  199. //transparency information in the tRNS chunk
  200. diff -Naur freepv-0.3.0/src/libfreepv/utils.cpp freepv-0.3.0-r1/src/libfreepv/utils.cpp
  201. --- freepv-0.3.0/src/libfreepv/utils.cpp 2009-05-02 08:12:31.000000000 +0900
  202. +++ freepv-0.3.0-r1/src/libfreepv/utils.cpp 2010-12-25 22:49:41.000000000 +0900
  203. @@ -23,6 +23,7 @@
  204. */
  205.  
  206. #include <algorithm>
  207. +#include <cstdio>
  208.  
  209. #include "utils.h"
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!