mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
52 lines
1.6 KiB
Text
52 lines
1.6 KiB
Text
--- src/raster.cxx 2004-09-27 00:45:31.000000000 -0400
|
|
+++ src/raster.cxx 2013-05-13 13:53:50.000000000 -0400
|
|
@@ -10,4 +10,6 @@
|
|
#include <gfx/raster.h>
|
|
|
|
+#include <string.h> /* For memcpy() */
|
|
+
|
|
#include <string>
|
|
#include <cctype>
|
|
@@ -49,6 +51,6 @@
|
|
|
|
|
|
-static char *img_names[] = {"PPM", "PNG", "TIFF", "JPEG"};
|
|
-static char *img_ext[] = {"ppm", "png", "tif", "jpg"};
|
|
+static const char *img_names[] = {"PPM", "PNG", "TIFF", "JPEG"};
|
|
+static const char *img_ext[] = {"ppm", "png", "tif", "jpg"};
|
|
|
|
const char *image_type_name(int type)
|
|
--- src/gltools.cxx 2005-06-18 09:58:15.000000000 -0400
|
|
+++ src/gltools.cxx 2013-05-13 13:56:31.000000000 -0400
|
|
@@ -57,5 +57,5 @@
|
|
GLuint nnames = *ptr++;
|
|
GLuint cur_zmin = *ptr++;
|
|
- /* GLuint cur_zmax = */ *ptr++;
|
|
+ ptr++;
|
|
|
|
if( cur_zmin < zmin )
|
|
--- src/arcball.cxx 2004-09-27 00:45:31.000000000 -0400
|
|
+++ src/arcball.cxx 2013-05-13 13:58:11.000000000 -0400
|
|
@@ -20,22 +20,4 @@
|
|
{
|
|
|
|
-// Converts a unit quaternion to two points on the unit sphere
|
|
-static void quat_to_sphere(const Quat& q, Vec3& from, Vec3& to)
|
|
-{
|
|
- const Vec3& v = q.vector();
|
|
-
|
|
- double s = sqrt(v[0]*v[0] + v[1]*v[1]);
|
|
- if( s==0.0 )
|
|
- from = Vec3(0.0, 1.0, 0.0);
|
|
- else
|
|
- from = Vec3(-v[1]/s, v[0]/s, 0.0);
|
|
-
|
|
- to[0] = q.scalar()*from[0] - v[2]*from[1];
|
|
- to[1] = q.scalar()*from[1] + v[2]*from[2];
|
|
- to[2] = v[0]*from[1] - v[1]*from[0];
|
|
-
|
|
- if(q.scalar() < 0.0) from = -from;
|
|
-}
|
|
-
|
|
// Converts to points on unit sphere into a unit quaternion
|
|
static Quat quat_from_sphere(const Vec3& from, const Vec3& to)
|