Revision: 41892
http://brlcad.svn.sourceforge.net/brlcad/?rev=41892&view=rev
Author: starseeker
Date: 2010-12-30 23:34:18 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Sync cmake branch to trunk r41891
Modified Paths:
--------------
brlcad/branches/cmake/include/bu.h
brlcad/branches/cmake/include/raytrace.h
brlcad/branches/cmake/src/libbu/image.c
brlcad/branches/cmake/src/libged/adjust.c
brlcad/branches/cmake/src/libged/bot.c
brlcad/branches/cmake/src/libged/human.c
brlcad/branches/cmake/src/libged/preview.c
brlcad/branches/cmake/src/libged/put.c
brlcad/branches/cmake/src/libged/screengrab.c
brlcad/branches/cmake/src/libged/showmats.c
brlcad/branches/cmake/src/liboptical/sh_toon.c
brlcad/branches/cmake/src/librt/primitives/bot/bot.c
brlcad/branches/cmake/src/other/libpng/configure.ac
Modified: brlcad/branches/cmake/include/bu.h
===================================================================
--- brlcad/branches/cmake/include/bu.h 2010-12-30 23:30:16 UTC (rev 41891)
+++ brlcad/branches/cmake/include/bu.h 2010-12-30 23:34:18 UTC (rev 41892)
@@ -6002,7 +6002,7 @@
};
BU_EXPORT BU_EXTERN(struct bu_image_file *bu_image_save_open,
- (char *filename,
+ (const char *filename,
int format,
int width,
int height,
Modified: brlcad/branches/cmake/include/raytrace.h
===================================================================
--- brlcad/branches/cmake/include/raytrace.h 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/include/raytrace.h 2010-12-30 23:34:18 UTC (rev
41892)
@@ -4718,7 +4718,7 @@
const mat_t mat));
RT_EXPORT BU_EXTERN(fastf_t rt_bot_propget,
(struct rt_bot_internal *bot,
- char *property));
+ const char *property));
RT_EXPORT BU_EXTERN(int rt_bot_vertex_fuse,
(struct rt_bot_internal *bot));
RT_EXPORT BU_EXTERN(int rt_bot_face_fuse,
Modified: brlcad/branches/cmake/src/libbu/image.c
===================================================================
--- brlcad/branches/cmake/src/libbu/image.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libbu/image.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -84,7 +84,7 @@
* I suck. I'll fix this later. Honest.
*/
HIDDEN int
-guess_file_format(char *filename, char *trimmedname)
+guess_file_format(const char *filename, char *trimmedname)
{
/* look for the FMT: header */
#define CMP(name) if (!strncmp(filename, #name":", strlen(#name)))
{bu_strlcpy(trimmedname, filename+strlen(#name)+1, BUFSIZ);return
BU_IMAGE_##name; }
@@ -260,7 +260,7 @@
}
struct bu_image_file *
-bu_image_save_open(char *filename, int format, int width, int height, int
depth)
+bu_image_save_open(const char *filename, int format, int width, int height,
int depth)
{
struct bu_image_file *bif = (struct bu_image_file
*)bu_malloc(sizeof(struct bu_image_file), "bu_image_save_open");
bif->magic = BU_IMAGE_FILE_MAGIC;
Modified: brlcad/branches/cmake/src/libged/adjust.c
===================================================================
--- brlcad/branches/cmake/src/libged/adjust.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libged/adjust.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -77,7 +77,7 @@
return GED_ERROR;
}
- status = intern.idb_meth->ft_adjust(&gedp->ged_result_str, &intern,
argc-2, (char **)argv+2);
+ status = intern.idb_meth->ft_adjust(&gedp->ged_result_str, &intern,
argc-2, argv+2);
if (status == GED_OK && wdb_put_internal(gedp->ged_wdbp, name, &intern,
1.0) < 0) {
bu_vls_printf(&gedp->ged_result_str, "wdb_export(%s) failure", name);
rt_db_free_internal(&intern);
Modified: brlcad/branches/cmake/src/libged/bot.c
===================================================================
--- brlcad/branches/cmake/src/libged/bot.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libged/bot.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -41,10 +41,10 @@
struct directory *bot_dp;
struct rt_db_internal intern;
struct rt_bot_internal *bot;
- char *cmd = argv[0];
- char *sub;
- char *arg;
- char *primitive = argv[argc - 1];
+ const char *cmd = argv[0];
+ const char *sub;
+ const char *arg;
+ const char *primitive = argv[argc - 1];
char prop = '\0';
size_t len;
fastf_t tmp;
Modified: brlcad/branches/cmake/src/libged/human.c
===================================================================
--- brlcad/branches/cmake/src/libged/human.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libged/human.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -1591,7 +1591,7 @@
/* Process command line arguments, all 43 of them */
HIDDEN int
-read_args(int argc, const char **argv, char *topLevel, struct human_data_t
*dude, fastf_t *percentile, fastf_t *location, fastf_t *stance, fastf_t
*troops, fastf_t *showBoxes)
+read_args(int argc, const char **argv, char *topLevel, struct human_data_t
*dude, fastf_t *percentile, fastf_t *location, int *stance, int *troops, int
*showBoxes)
{
char c = 'A';
char
*options="AbH:hLlmn:N:O:o:p:s:tTvVw1:2:3:4:5:6:7:8:9:0:=:+:_:*:^:%:$:#:@:!:Q:~:Z:Y:X:";
Modified: brlcad/branches/cmake/src/libged/preview.c
===================================================================
--- brlcad/branches/cmake/src/libged/preview.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libged/preview.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -405,7 +405,7 @@
while (ged_loadframe(gedp, fp) == GED_OK) {
if (image_name) {
struct bu_vls fullname;
- char *screengrab_args[3];
+ const char *screengrab_args[3];
int screengrab_argc = 0;
struct view_obj *vop;
Modified: brlcad/branches/cmake/src/libged/put.c
===================================================================
--- brlcad/branches/cmake/src/libged/put.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libged/put.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -93,7 +93,7 @@
rt_generic_make(ftp, &intern);
}
- if (!ftp->ft_adjust || ftp->ft_adjust(&gedp->ged_result_str, &intern,
argc-3, (char **)argv+3) == GED_ERROR) {
+ if (!ftp->ft_adjust || ftp->ft_adjust(&gedp->ged_result_str, &intern,
argc-3, argv+3) == GED_ERROR) {
rt_db_free_internal(&intern);
return GED_ERROR;
}
Modified: brlcad/branches/cmake/src/libged/screengrab.c
===================================================================
--- brlcad/branches/cmake/src/libged/screengrab.c 2010-12-30 23:30:16 UTC
(rev 41891)
+++ brlcad/branches/cmake/src/libged/screengrab.c 2010-12-30 23:34:18 UTC
(rev 41892)
@@ -93,7 +93,7 @@
for (i = 0; i < height; ++i) {
rows[i] = (unsigned char *)(idata + ((height-i-1)*bytes_per_line));
- bu_image_save_writeline(bif, i, (const unsigned char *)rows[i]);
+ bu_image_save_writeline(bif, i, (unsigned char *)rows[i]);
}
if (bif != NULL)
Modified: brlcad/branches/cmake/src/libged/showmats.c
===================================================================
--- brlcad/branches/cmake/src/libged/showmats.c 2010-12-30 23:30:16 UTC (rev
41891)
+++ brlcad/branches/cmake/src/libged/showmats.c 2010-12-30 23:34:18 UTC (rev
41892)
@@ -81,7 +81,7 @@
}
static int
-Run_showmats(struct ged *gedp, char *path, int aflag)
+Run_showmats(struct ged *gedp, const char *path, int aflag)
{
struct showmats_data sm_data;
char *parent;
Modified: brlcad/branches/cmake/src/liboptical/sh_toon.c
===================================================================
--- brlcad/branches/cmake/src/liboptical/sh_toon.c 2010-12-30 23:30:16 UTC
(rev 41891)
+++ brlcad/branches/cmake/src/liboptical/sh_toon.c 2010-12-30 23:34:18 UTC
(rev 41892)
@@ -38,7 +38,7 @@
#include "rtprivate.h"
#include "light.h"
-#define TOON_MAGIC 0x746F6F6E0A /* make this a unique number for each
shader */
+#define TOON_MAGIC 0x746F6F6E /* make this a unique number for each shader
*/
#define CK_TOON_SP(_p) BU_CKMAG(_p, TOON_MAGIC, "toon_specific")
/*
Modified: brlcad/branches/cmake/src/librt/primitives/bot/bot.c
===================================================================
--- brlcad/branches/cmake/src/librt/primitives/bot/bot.c 2010-12-30
23:30:16 UTC (rev 41891)
+++ brlcad/branches/cmake/src/librt/primitives/bot/bot.c 2010-12-30
23:34:18 UTC (rev 41892)
@@ -2678,7 +2678,7 @@
* Returns -1 on error.
*/
fastf_t
-rt_bot_propget(struct rt_bot_internal *bot, char *property)
+rt_bot_propget(struct rt_bot_internal *bot, const char *property)
{
size_t len;
Modified: brlcad/branches/cmake/src/other/libpng/configure.ac
===================================================================
--- brlcad/branches/cmake/src/other/libpng/configure.ac 2010-12-30 23:30:16 UTC
(rev 41891)
+++ brlcad/branches/cmake/src/other/libpng/configure.ac 2010-12-30 23:34:18 UTC
(rev 41892)
@@ -42,7 +42,6 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
LT_INIT([win32-dll])
-LT_INIT([win32-dll])
# Checks for header files.
AC_HEADER_STDC
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
