Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Paul F. <pg...@us...> - 2006-10-22 19:27:51
|
Update of /cvsroot/roadmap/roadmap/src/gpx In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31178 Modified Files: defs.h gpx.c Log Message: move float conversions to defs.h Index: defs.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gpx/defs.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** defs.h 4 Oct 2006 20:25:04 -0000 1.5 --- defs.h 22 Oct 2006 19:26:57 -0000 1.6 *************** *** 61,64 **** --- 61,71 ---- #define XML_LONG_TIME 2 + /* Format used for floating point formats. */ + #define FLT_FMT "%0.6lf" + + /* convert to/from roadmap's internal "microdegrees" */ + #define from_float(x) ((x) * 1000000.0) + #define to_float(x) ((double)((x) / 1000000.0)) + /* * Common definitions. There should be no protocol or file-specific Index: gpx.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gpx/gpx.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gpx.c 4 Oct 2006 20:25:04 -0000 1.9 --- gpx.c 22 Oct 2006 19:26:57 -0000 1.10 *************** *** 101,111 **** - /* Format used for floating point formats. */ - #define FLT_FMT "%0.6lf" - - /* convert to/from roadmap's internal "microdegrees" */ - #define from_float(x) ((x) * 1000000.0) - #define to_float(x) ((double)((x) / 1000000.0)) - typedef enum { tt_unknown = 0, --- 101,104 ---- |
|
From: Ehud S. <esh...@us...> - 2006-10-15 16:59:07
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29912/src/win32/wince_env/zlib Modified Files: Tag: BR-0_8_X zlib.vcp Log Message: Fix zlib sources path. Index: zlib.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib/zlib.vcp,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** zlib.vcp 14 Oct 2006 09:29:40 -0000 1.1 --- zlib.vcp 15 Oct 2006 16:59:00 -0000 1.1.2.1 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c [...1145 lines suppressed...] ! "..\..\..\zlib\zutil.h"\ *************** *** 863,869 **** DEP_CPP_ZUTIL=\ ! ".\zconf.h"\ ! ".\zlib.h"\ ! ".\zutil.h"\ --- 630,636 ---- DEP_CPP_ZUTIL=\ ! "..\..\..\zlib\zconf.h"\ ! "..\..\..\zlib\zlib.h"\ ! "..\..\..\zlib\zutil.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-10-15 16:48:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25050 Modified Files: zlib.vcp Log Message: Fix zlib sources path. Index: zlib.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib/zlib.vcp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zlib.vcp 14 Oct 2006 09:29:40 -0000 1.1 --- zlib.vcp 15 Oct 2006 16:48:35 -0000 1.2 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c [...1145 lines suppressed...] ! "..\..\..\zlib\zutil.h"\ *************** *** 863,869 **** DEP_CPP_ZUTIL=\ ! ".\zconf.h"\ ! ".\zlib.h"\ ! ".\zutil.h"\ --- 630,636 ---- DEP_CPP_ZUTIL=\ ! "..\..\..\zlib\zconf.h"\ ! "..\..\..\zlib\zlib.h"\ ! "..\..\..\zlib\zutil.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-10-15 11:00:21
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21557 Modified Files: roadmap_main.cpp Log Message: Fix RoadGPS instance detection. Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** roadmap_main.cpp 8 Oct 2006 20:05:20 -0000 1.21 --- roadmap_main.cpp 15 Oct 2006 11:00:17 -0000 1.22 *************** *** 404,409 **** } } ! if (other_instance) return 0; if (!MyRegisterClass(hInstance, szWindowClass)) --- 404,411 ---- } } ! ! #ifndef _ROADGPS if (other_instance) return 0; + #endif if (!MyRegisterClass(hInstance, szWindowClass)) |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:55:14
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19521 Modified Files: lang Log Message: Update. Index: lang =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/lang,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang 14 Oct 2006 09:02:54 -0000 1.4 --- lang 15 Oct 2006 10:55:08 -0000 1.5 *************** *** 103,104 **** --- 103,105 ---- Password=ס×ס×× RoadMap=FreeMap + Please free at least 5MB of space before synchronizing.=×× × ×¤× × ×פ××ת 5MB ×©× ×××ר×× ××¤× × ××צ××¢ ××¡× ×ר××. |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:53:49
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18858 Modified Files: roadmap_file.h Log Message: Add free space function. Index: roadmap_file.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_file.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_file.h 13 Jul 2006 06:33:57 -0000 1.5 --- roadmap_file.h 15 Oct 2006 10:53:42 -0000 1.6 *************** *** 94,97 **** --- 94,99 ---- const char *roadmap_file_unique (const char *base); + int roadmap_file_free_space (const char *path); + #endif // INCLUDE__ROADMAP_FILE__H |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:53:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18476 Modified Files: roadmap_file.c Log Message: Add free space function. Index: roadmap_file.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_file.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_file.c 16 Jul 2006 12:28:50 -0000 1.6 --- roadmap_file.c 15 Oct 2006 10:53:00 -0000 1.7 *************** *** 570,571 **** --- 570,592 ---- } + + int roadmap_file_free_space (const char *path) + { + ULARGE_INTEGER FreeBytesAvailableToCaller; + ULARGE_INTEGER TotalNumberOfBytes; + ULARGE_INTEGER TotalNumberOfFreeBytes; + + LPWSTR dir_name = ConvertToWideChar(path, CP_UTF8); + + if (!GetDiskFreeSpaceEx(dir_name, + &FreeBytesAvailableToCaller, + &TotalNumberOfBytes, + &TotalNumberOfFreeBytes)) { + + free (dir_name); + return -1; + } + + free (dir_name); + return (int) (FreeBytesAvailableToCaller.QuadPart / 1024); + } |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:52:42
|
Update of /cvsroot/roadmap/roadmap_editor/src/unix In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18464 Modified Files: roadmap_file.c Log Message: Add free space function. Index: roadmap_file.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_file.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_file.c 17 Jul 2006 06:35:19 -0000 1.4 --- roadmap_file.c 15 Oct 2006 10:52:38 -0000 1.5 *************** *** 385,386 **** --- 385,390 ---- } + int roadmap_file_free_space (const char *path) { + return -1; + } + |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:52:10
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/track In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18151 Modified Files: editor_track_known.c Log Message: Check for candidates boundary. Index: editor_track_known.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_known.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** editor_track_known.c 9 Aug 2006 07:30:08 -0000 1.7 --- editor_track_known.c 15 Oct 2006 10:52:04 -0000 1.8 *************** *** 51,56 **** #include "editor_track_known.h" ! #define MAX_ENTRIES 5 ! #define MAX_PATHS 5 typedef struct { --- 51,56 ---- #include "editor_track_known.h" ! #define MAX_ENTRIES 7 ! #define MAX_PATHS 10 typedef struct { *************** *** 472,476 **** KnownCandidates[KnownCandidatesCount].count = 1; ! KnownCandidatesCount++; } } --- 472,480 ---- KnownCandidates[KnownCandidatesCount].count = 1; ! KnownCandidatesCount++; ! if (KnownCandidatesCount == MAX_PATHS) { ! roadmap_log (ROADMAP_ERROR, "ResolveCandidates - Reached max entries!"); ! break; ! } } } |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:51:10
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/export In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17973 Modified Files: editor_sync.c editor_upload.c editor_upload.h Log Message: Fix export name month and add year. Check for free space before doing a synch. Add server messages reader. Index: editor_sync.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_sync.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** editor_sync.c 3 Sep 2006 18:09:39 -0000 1.3 --- editor_sync.c 15 Oct 2006 10:51:05 -0000 1.4 *************** *** 46,49 **** --- 46,51 ---- #include "editor_sync.h" + #define MAX_MSGS 10 + #define MIN_FREE_SPACE 5000 //Free space in KB static int SyncProgressItems; *************** *** 70,73 **** --- 72,76 ---- va_end(ap); + roadmap_log (ROADMAP_ERROR, "Sync error: %s", message); roadmap_messagebox ("Download Error", message); } *************** *** 133,138 **** tm = gmtime (&now); ! snprintf (name, sizeof(name), "rm_%02d_%02d_%02d%02d.gpx.gz", ! tm->tm_mday, tm->tm_mon, tm->tm_hour, tm->tm_min); full_name = roadmap_path_join (path, name); --- 136,142 ---- tm = gmtime (&now); ! snprintf (name, sizeof(name), "rm_%02d_%02d_%02d_%02d%02d.gpx.gz", ! tm->tm_mday, tm->tm_mon+1, tm->tm_year-100, ! tm->tm_hour, tm->tm_min); full_name = roadmap_path_join (path, name); *************** *** 147,151 **** ! static int sync_do_upload (void) { char **files; --- 151,155 ---- ! static int sync_do_upload (char *messages[MAX_MSGS], int *num_msgs) { char **files; *************** *** 164,178 **** SyncProgressItems = count; SyncProgressCurrentItem = 0; for (cursor = files; *cursor != NULL; ++cursor) { char *full_name = roadmap_path_join (directory, *cursor); ! int res = editor_upload_auto (full_name, &SyncDownloadCallbackFunctions); if (res == 0) { roadmap_file_remove (NULL, full_name); } free (full_name); } --- 168,187 ---- SyncProgressItems = count; SyncProgressCurrentItem = 0; + *num_msgs = 0; for (cursor = files; *cursor != NULL; ++cursor) { char *full_name = roadmap_path_join (directory, *cursor); ! int res = editor_upload_auto (full_name, &SyncDownloadCallbackFunctions, ! messages + *num_msgs); if (res == 0) { roadmap_file_remove (NULL, full_name); + if (messages[*num_msgs] != NULL) (*num_msgs)++; } free (full_name); + + if (*num_msgs == MAX_MSGS) break; } *************** *** 185,188 **** --- 194,198 ---- int export_sync (void) { + int i; int res; int fips; *************** *** 191,194 **** --- 201,206 ---- time_t now_t; time_t map_time_t; + char *messages[MAX_MSGS]; + int num_msgs; if (!editor_is_enabled ()) { *************** *** 196,199 **** --- 208,219 ---- } + res = roadmap_file_free_space (roadmap_path_user()); + + if ((res >= 0) && (res < MIN_FREE_SPACE)) { + roadmap_messagebox ("Error", + "Please free at least 5MB of space before synchronizing."); + return -1; + } + roadmap_download_progress (0); roadmap_dialog_set_data ("Sync", "Progress status", *************** *** 205,209 **** roadmap_lang_get ("Uploading data...")); roadmap_main_flush (); ! res = sync_do_upload (); fips = roadmap_locator_active (); --- 225,229 ---- roadmap_lang_get ("Uploading data...")); roadmap_main_flush (); ! res = sync_do_upload (messages, &num_msgs); fips = roadmap_locator_active (); *************** *** 250,253 **** --- 270,278 ---- } end_sync: + + for (i=0; i<num_msgs; i++) { + roadmap_messagebox ("Info", messages[i]); + free (messages[i]); + } roadmap_dialog_hide ("Sync process"); return 0; Index: editor_upload.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** editor_upload.h 9 Aug 2006 07:27:14 -0000 1.3 --- editor_upload.h 15 Oct 2006 10:51:05 -0000 1.4 *************** *** 32,36 **** int editor_upload_auto (const char *filename, ! RoadMapDownloadCallbacks *callbacks); #endif // INCLUDE__EDITOR_UPLOAD__H --- 32,37 ---- int editor_upload_auto (const char *filename, ! RoadMapDownloadCallbacks *callbacks, ! char **message); #endif // INCLUDE__EDITOR_UPLOAD__H Index: editor_upload.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** editor_upload.c 14 Oct 2006 09:12:37 -0000 1.8 --- editor_upload.c 15 Oct 2006 10:51:05 -0000 1.9 *************** *** 361,365 **** if (next != buffer) { if (strstr (buffer, " 200 ") == NULL) { ! error ("received bad status: %s", buffer); return -1; } --- 361,365 ---- if (next != buffer) { if (strstr (buffer, " 200 ") == NULL) { ! error ("Received bad status: %s", buffer); return -1; } *************** *** 379,383 **** *sizeof_buffer = received; ! return 0; } --- 379,383 ---- *sizeof_buffer = received; ! return size; } *************** *** 393,397 **** while (*(++p) == ' ') ; size = atoi(p); ! if (size <= 0) { error ("bad formed header: %s", buffer); return -1; --- 393,397 ---- while (*(++p) == ' ') ; size = atoi(p); ! if (size < 0) { error ("bad formed header: %s", buffer); return -1; *************** *** 419,423 **** const char *user_name, const char *password, ! RoadMapDownloadCallbacks *callbacks) { RoadMapSocket fd; --- 419,424 ---- const char *user_name, const char *password, ! RoadMapDownloadCallbacks *callbacks, ! char **message) { RoadMapSocket fd; *************** *** 430,433 **** --- 431,438 ---- RoadMapFile file; + if (message != NULL) { + *message = NULL; + } + if (!callbacks) callbacks = &EditorUploadCallbackFunctions; *************** *** 497,513 **** loaded = sizeof(buffer); ! if (editor_http_decode_response ! (fd, buffer, &loaded, callbacks->error) < 0) { goto cancel_upload; } roadmap_net_close (fd); roadmap_file_close (file); roadmap_dialog_hide ("Uploading"); buffer[loaded] = 0; - - if (callbacks == &EditorUploadCallbackFunctions) { - roadmap_messagebox ("Upload done.", buffer); - } return 0; --- 502,533 ---- loaded = sizeof(buffer); ! size = editor_http_decode_response ! (fd, buffer, &loaded, callbacks->error); ! ! if (size < 0) { goto cancel_upload; } + if ((message != NULL) && (size > 1)) { + *message = malloc(size+1); + memcpy (*message, buffer, loaded); + + while (loaded < size) { + int r; + r = roadmap_net_receive (fd, *message + loaded, size - loaded); + + if (r <= 0) break; + + loaded += r; + } + + (*message)[loaded] = '\0'; + + } + roadmap_net_close (fd); roadmap_file_close (file); roadmap_dialog_hide ("Uploading"); buffer[loaded] = 0; return 0; *************** *** 528,531 **** --- 548,552 ---- const char *username; const char *password; + char *message; filename = roadmap_dialog_get_data (".file", "Name"); *************** *** 542,546 **** roadmap_dialog_hide (name); ! editor_post_file (target, filename, username, password, NULL); } --- 563,570 ---- roadmap_dialog_hide (name); ! editor_post_file (target, filename, username, password, NULL, &message); ! if (message != NULL) { ! roadmap_messagebox ("Info", message); ! } } *************** *** 613,617 **** int editor_upload_auto (const char *filename, ! RoadMapDownloadCallbacks *callbacks) { return editor_post_file ( --- 637,642 ---- int editor_upload_auto (const char *filename, ! RoadMapDownloadCallbacks *callbacks, ! char **message) { return editor_post_file ( *************** *** 620,624 **** roadmap_config_get (&RoadMapConfigUser), roadmap_config_get (&RoadMapConfigPassword), ! callbacks); } --- 645,650 ---- roadmap_config_get (&RoadMapConfigUser), roadmap_config_get (&RoadMapConfigPassword), ! callbacks, ! message); } |
|
From: Ehud S. <esh...@us...> - 2006-10-15 10:48:21
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16893 Modified Files: editor_main.c Log Message: Bump version. Index: editor_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/editor_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** editor_main.c 17 Sep 2006 20:38:12 -0000 1.18 --- editor_main.c 15 Oct 2006 10:48:16 -0000 1.19 *************** *** 47,51 **** int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.8.0"; void editor_main_check_map (void) { --- 47,51 ---- int EditorPluginID = -1; ! const char *EDITOR_VERSION = "0.8.2"; void editor_main_check_map (void) { |
|
From: Ehud S. <esh...@us...> - 2006-10-14 10:32:03
|
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8495 Modified Files: roadmap_navigate.c Log Message: Set speed value even if speed is lower than the accurate minimum. Index: roadmap_navigate.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_navigate.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** roadmap_navigate.c 3 Sep 2006 18:06:09 -0000 1.16 --- roadmap_navigate.c 14 Oct 2006 10:31:59 -0000 1.17 *************** *** 602,609 **** } if ((RoadMapLatestGpsPosition.latitude == gps_position->latitude) && (RoadMapLatestGpsPosition.longitude == gps_position->longitude)) return; - if (gps_position->speed < roadmap_gps_speed_accuracy()) return; RoadMapLatestGpsPosition = *gps_position; --- 602,614 ---- } + if (gps_position->speed < roadmap_gps_speed_accuracy()) { + + RoadMapLatestGpsPosition.speed = gps_position->speed; + return; + } + if ((RoadMapLatestGpsPosition.latitude == gps_position->latitude) && (RoadMapLatestGpsPosition.longitude == gps_position->longitude)) return; RoadMapLatestGpsPosition = *gps_position; |
|
From: Ehud S. <esh...@us...> - 2006-10-14 10:31:10
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8195 Modified Files: navigate_dglib.c Log Message: Fix route calculation for departure points which are against the road direction. Index: navigate_dglib.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_dglib.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** navigate_dglib.c 18 Aug 2006 17:52:50 -0000 1.6 --- navigate_dglib.c 14 Oct 2006 10:31:03 -0000 1.7 *************** *** 35,38 **** --- 35,39 ---- #include "roadmap_line.h" #include "roadmap_locator.h" + #include "roadmap_main.h" #include "roadmap_turns.h" #include "roadmap_metadata.h" *************** *** 49,52 **** --- 50,54 ---- typedef struct { PluginLine from_line; + int from_against_dir; int turn_restrictions; } NavigateClip; *************** *** 70,73 **** --- 72,76 ---- } else { from_line = roadmap_plugin_get_line_id (&info->from_line); + if (info->from_against_dir) from_line = -from_line; } *************** *** 120,123 **** --- 123,128 ---- } + roadmap_main_set_cursor (ROADMAP_CURSOR_WAIT); + do { snprintf (path, sizeof(path), "%s/usc%05d.dgl", sequence, fips); *************** *** 131,134 **** --- 136,140 ---- if ( fd == NULL ) { + roadmap_main_set_cursor (ROADMAP_CURSOR_NORMAL); roadmap_messagebox ("Error", "Can't find route data."); return -1; *************** *** 139,142 **** --- 145,150 ---- fclose( fd ); + roadmap_main_set_cursor (ROADMAP_CURSOR_NORMAL); + if ( nret < 0 ) { roadmap_messagebox ("Error", "Can't load route data."); *************** *** 170,173 **** --- 178,183 ---- int nret; int total_cost; + int line_from_point; + int line_to_point; dglSPReport_s *pReport; *************** *** 180,183 **** --- 190,202 ---- NavigateClipData.from_line = *from_line; + + //FIXME add plugin support + roadmap_line_points (from_line->line_id, &line_from_point, &line_to_point); + if (from_point == line_from_point) { + NavigateClipData.from_against_dir = 1; + } else { + NavigateClipData.from_against_dir = 0; + } + NavigateClipData.turn_restrictions = 1; |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:30:42
|
Update of /cvsroot/roadmap/roadmap_editor/src/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16953 Removed Files: zlib.vcp Log Message: Remove evc project file as it should be in the wince_env dir. --- zlib.vcp DELETED --- |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:29:44
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16523/zlib Added Files: zlib.vcp Log Message: Update evc environment files. --- NEW FILE: zlib.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="zlib" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE MIPS) Static Library" 0x8204 # TARGTYPE "Win32 (WCE SH3) Static Library" 0x8104 # TARGTYPE "Win32 (WCE ARM) Static Library" 0x8504 # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304 CFG=zlib - Win32 (WCE ARM) Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "zlib.vcn". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "zlib.vcn" CFG="zlib - Win32 (WCE ARM) Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "zlib - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library") !MESSAGE "zlib - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library") !MESSAGE "zlib - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Static Library") !MESSAGE "zlib - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library") !MESSAGE "zlib - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE "zlib - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" # PROP ATL_Project 2 !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMRel" # PROP BASE Intermediate_Dir "ARMRel" # PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMRel" # PROP Intermediate_Dir "ARMRel" # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NO_ERRNO_H" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMDbg" # PROP BASE Intermediate_Dir "ARMDbg" # PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMDbg" # PROP Intermediate_Dir "ARMDbg" # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "NO_ERRNO_H" /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "MIPSRel" # PROP BASE Intermediate_Dir "MIPSRel" # PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "MIPSRel" # PROP Intermediate_Dir "MIPSRel" # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo CPP=clmips.exe # ADD BASE CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "NO_ERRNO_H" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "NO_ERRNO_H" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "SH3Rel" # PROP BASE Intermediate_Dir "SH3Rel" # PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "SH3Rel" # PROP Intermediate_Dir "SH3Rel" # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=shcl.exe # ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "NO_ERRNO_H" /YX /M$(CECrtMT) /c # ADD CPP /nologo /W3 /Oxs /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D "NO_ERRNO_H" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Rel" # PROP BASE Intermediate_Dir "ARMV4Rel" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Rel" # PROP Intermediate_Dir "ARMV4Rel" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /Zd /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "NO_ERRNO_H" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /O2 /M$(CECrtMT) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMV4Dbg" # PROP BASE Intermediate_Dir "ARMV4Dbg" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMV4Dbg" # PROP Intermediate_Dir "ARMV4Dbg" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NO_ERRNO_H" /YX /M$(CECrtMTDebug) /c LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo !ENDIF # Begin Target # Name "zlib - Win32 (WCE ARM) Release" # Name "zlib - Win32 (WCE ARM) Debug" # Name "zlib - Win32 (WCE MIPS) Release" # Name "zlib - Win32 (WCE SH3) Release" # Name "zlib - Win32 (WCE ARMV4) Release" # Name "zlib - Win32 (WCE ARMV4) Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\adler32.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_ADLER=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_ADLER=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_ADLER=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_ADLER=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_ADLER=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_ADLER=\ ".\zconf.h"\ ".\zlib.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\compress.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_COMPR=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_COMPR=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_COMPR=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_COMPR=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_COMPR=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_COMPR=\ ".\zconf.h"\ ".\zlib.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\crc32.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_CRC32=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_CRC32=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_CRC32=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_CRC32=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_CRC32=\ ".\crc32.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_CRC32=\ ".\crc32.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\deflate.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_DEFLA=\ ".\deflate.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_DEFLA=\ ".\deflate.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_DEFLA=\ ".\deflate.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_DEFLA=\ ".\deflate.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_DEFLA=\ ".\deflate.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_DEFLA=\ ".\deflate.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\gzio.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_GZIO_=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_GZIO_=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_GZIO_=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_GZIO_=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_GZIO_=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_GZIO_=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\inffast.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_INFFA=\ ".\inffast.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFFA=\ ".\infblock.h"\ ".\infcodes.h"\ ".\infutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_INFFA=\ ".\inffast.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFFA=\ ".\infblock.h"\ ".\infcodes.h"\ ".\infutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_INFFA=\ ".\inffast.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFFA=\ ".\infblock.h"\ ".\infcodes.h"\ ".\infutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_INFFA=\ ".\inffast.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFFA=\ ".\infblock.h"\ ".\infcodes.h"\ ".\infutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_INFFA=\ ".\inffast.h"\ ".\inflate.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_INFFA=\ ".\inffast.h"\ ".\inflate.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\inflate.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_INFLA=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFLA=\ ".\infblock.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_INFLA=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFLA=\ ".\infblock.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_INFLA=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFLA=\ ".\infblock.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_INFLA=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ NODEP_CPP_INFLA=\ ".\infblock.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_INFLA=\ ".\inffast.h"\ ".\inffixed.h"\ ".\inflate.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_INFLA=\ ".\inffast.h"\ ".\inffixed.h"\ ".\inflate.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\inftrees.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_INFTR=\ ".\inffixed.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_INFTR=\ ".\inffixed.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_INFTR=\ ".\inffixed.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_INFTR=\ ".\inffixed.h"\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_INFTR=\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_INFTR=\ ".\inftrees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\trees.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_TREES=\ ".\deflate.h"\ ".\trees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_TREES=\ ".\deflate.h"\ ".\trees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_TREES=\ ".\deflate.h"\ ".\trees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_TREES=\ ".\deflate.h"\ ".\trees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_TREES=\ ".\deflate.h"\ ".\trees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_TREES=\ ".\deflate.h"\ ".\trees.h"\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\uncompr.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_UNCOM=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_UNCOM=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_UNCOM=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_UNCOM=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_UNCOM=\ ".\zconf.h"\ ".\zlib.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_UNCOM=\ ".\zconf.h"\ ".\zlib.h"\ !ENDIF # End Source File # Begin Source File SOURCE=.\zutil.c !IF "$(CFG)" == "zlib - Win32 (WCE ARM) Release" DEP_CPP_ZUTIL=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARM) Debug" DEP_CPP_ZUTIL=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE MIPS) Release" DEP_CPP_ZUTIL=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE SH3) Release" DEP_CPP_ZUTIL=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Release" DEP_CPP_ZUTIL=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ELSEIF "$(CFG)" == "zlib - Win32 (WCE ARMV4) Debug" DEP_CPP_ZUTIL=\ ".\zconf.h"\ ".\zlib.h"\ ".\zutil.h"\ !ENDIF # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\deflate.h # End Source File # Begin Source File SOURCE=.\infblock.h # End Source File # Begin Source File SOURCE=.\infcodes.h # End Source File # Begin Source File SOURCE=.\inffast.h # End Source File # Begin Source File SOURCE=.\inffixed.h # End Source File # Begin Source File SOURCE=.\inftrees.h # End Source File # Begin Source File SOURCE=.\infutil.h # End Source File # Begin Source File SOURCE=.\trees.h # End Source File # Begin Source File SOURCE=.\zconf.h # End Source File # Begin Source File SOURCE=.\zlib.h # End Source File # Begin Source File SOURCE=.\zutil.h # End Source File # End Group # End Target # End Project |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:29:44
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16523/libguiroadmap Modified Files: libguiroadmap.vcp Log Message: Update evc environment files. Index: libguiroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libguiroadmap/libguiroadmap.vcp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** libguiroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.6 --- libguiroadmap.vcp 14 Oct 2006 09:29:40 -0000 1.7 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Release" *************** *** 1271,1275 **** "..\..\roadmap_win32.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Debug" --- 1271,1275 ---- "..\..\roadmap_win32.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE x86) Debug" *************** *** 1301,1305 **** "..\..\roadmap_win32.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Debug" --- 1301,1305 ---- "..\..\roadmap_win32.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Debug" *************** *** 1335,1342 **** "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ "C:\Projects\zlib-1.2.3\zconf.h"\ "C:\Projects\zlib-1.2.3\zlib.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release" --- 1335,1344 ---- "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ + + NODEP_CPP_ROADMAP_DO=\ "C:\Projects\zlib-1.2.3\zconf.h"\ "C:\Projects\zlib-1.2.3\zlib.h"\ ! # ADD CPP /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Release" *************** *** 1372,1379 **** "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ - "C:\Projects\zlib-1.2.3\zconf.h"\ - "C:\Projects\zlib-1.2.3\zlib.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler" --- 1374,1379 ---- "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ ! # ADD CPP /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libguiroadmap - Win32 (WCE ARMV4) Profiler" *************** *** 1407,1411 **** "..\..\win32_serial.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ENDIF --- 1407,1411 ---- "..\..\win32_serial.h"\ ! # ADD CPP /I "..\..\..\zlib" !ENDIF *************** *** 1872,1875 **** --- 1872,1876 ---- DEP_CPP_ROADMAP_HT=\ + "..\..\..\editor\editor_main.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_download.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:29:43
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16523/libroadmap Modified Files: libroadmap.vcp Log Message: Update evc environment files. Index: libroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** libroadmap.vcp 3 Sep 2006 18:20:35 -0000 1.18 --- libroadmap.vcp 14 Oct 2006 09:29:40 -0000 1.19 *************** *** 51,63 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug" --- 51,63 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c # ADD CPP /nologo /W3 /I "./wince_os" /I "../../wince_os/" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug" *************** *** 77,89 **** # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo - LIB32=link.exe -lib - # ADD BASE LIB32 /nologo - # ADD LIB32 /nologo CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /FR /YX /M$(CECrtMTDebug) /c !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Release" --- 77,89 ---- # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /I "../../wince_os/" /I "../../" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /FR /YX /M$(CECrtMTDebug) /c + LIB32=link.exe -lib + # ADD BASE LIB32 /nologo + # ADD LIB32 /nologo + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Release" *************** *** 1142,1146 **** "..\..\roadmap_win32.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug" --- 1142,1146 ---- "..\..\roadmap_win32.h"\ ! # ADD CPP /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug" *************** *** 1171,1175 **** "..\..\roadmap_win32.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug" --- 1171,1175 ---- "..\..\roadmap_win32.h"\ ! # ADD CPP /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug" *************** *** 1223,1230 **** "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ "C:\Projects\zlib-1.2.3\zconf.h"\ "C:\Projects\zlib-1.2.3\zlib.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release" --- 1223,1232 ---- "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ + + NODEP_CPP_EDITOR_E=\ "C:\Projects\zlib-1.2.3\zconf.h"\ "C:\Projects\zlib-1.2.3\zlib.h"\ ! # ADD CPP /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release" *************** *** 1278,1285 **** "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ - "C:\Projects\zlib-1.2.3\zconf.h"\ - "C:\Projects\zlib-1.2.3\zlib.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler" --- 1280,1285 ---- "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ ! # ADD CPP /I "..\..\..\zlib" !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler" *************** *** 1327,1331 **** "..\..\win32_serial.h"\ ! # ADD CPP /I "c:\projects\zlib-1.2.3" !ENDIF --- 1327,1331 ---- "..\..\win32_serial.h"\ ! # ADD CPP /I "..\..\..\zlib" !ENDIF *************** *** 2939,2942 **** --- 2939,2943 ---- DEP_CPP_EDITOR_SY=\ + "..\..\..\editor\editor_main.h"\ "..\..\..\editor\export\editor_download.h"\ "..\..\..\editor\export\editor_export.h"\ *************** *** 4129,4132 **** --- 4130,4134 ---- DEP_CPP_EDITOR_U=\ + "..\..\..\editor\editor_main.h"\ "..\..\..\editor\export\editor_upload.h"\ "..\..\..\md5.h"\ *************** *** 4751,4754 **** --- 4753,4757 ---- "..\..\..\roadmap_line_route.h"\ "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_message.h"\ *************** *** 5931,5934 **** --- 5934,5938 ---- "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:29:01
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16134/zlib Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/zlib added to the repository |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:19:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12322 Modified Files: roadmap_net.c Log Message: Add wait parameter to roadmap_net_send Index: roadmap_net.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_net.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_net.c 3 Sep 2006 18:17:46 -0000 1.4 --- roadmap_net.c 14 Oct 2006 09:19:01 -0000 1.5 *************** *** 143,157 **** ! int roadmap_net_send (RoadMapSocket socket, const void *data, int length) { int total = length; fd_set fds; ! struct timeval recv_timeout; FD_ZERO(&fds); FD_SET(socket, &fds); ! recv_timeout.tv_sec = 60; ! recv_timeout.tv_usec = 0; while (length > 0) { --- 143,159 ---- ! int roadmap_net_send (RoadMapSocket socket, const void *data, int length, ! int wait) { int total = length; fd_set fds; ! struct timeval recv_timeout = {0, 0}; FD_ZERO(&fds); FD_SET(socket, &fds); ! if (wait) { ! recv_timeout.tv_sec = 60; ! } while (length > 0) { *************** *** 163,167 **** roadmap_log (ROADMAP_ERROR, "Timeout waiting for select in roadmap_net_send"); ! return -1; } --- 165,170 ---- roadmap_log (ROADMAP_ERROR, "Timeout waiting for select in roadmap_net_send"); ! if (!wait) return 0; ! else return -1; } *************** *** 191,218 **** int roadmap_net_receive (RoadMapSocket socket, void *data, int size) { ! int res; ! fd_set fds; ! struct timeval recv_timeout; ! ! FD_ZERO(&fds); ! FD_SET(socket, &fds); ! ! recv_timeout.tv_sec = 30; ! recv_timeout.tv_usec = 0; ! ! res = select(0, &fds, NULL, NULL, &recv_timeout); ! ! if(!res) { ! roadmap_log (ROADMAP_ERROR, ! "Timeout waiting for select in roadmap_net_send"); ! return -1; ! } ! ! if(res < 0) { ! roadmap_log (ROADMAP_ERROR, ! "Error waiting on select in roadmap_net_send, LastError = %d", ! WSAGetLastError()); ! return -1; ! } res = recv(socket, data, size, 0); --- 194,221 ---- int roadmap_net_receive (RoadMapSocket socket, void *data, int size) { ! int res; ! fd_set fds; ! struct timeval recv_timeout; ! ! FD_ZERO(&fds); ! FD_SET(socket, &fds); ! ! recv_timeout.tv_sec = 90; ! recv_timeout.tv_usec = 0; ! ! res = select(0, &fds, NULL, NULL, &recv_timeout); ! ! if(!res) { ! roadmap_log (ROADMAP_ERROR, ! "Timeout waiting for select in roadmap_net_send"); ! return -1; ! } ! ! if(res < 0) { ! roadmap_log (ROADMAP_ERROR, ! "Error waiting on select in roadmap_net_send, LastError = %d", ! WSAGetLastError()); ! return -1; ! } res = recv(socket, data, size, 0); *************** *** 355,363 **** return -1; ! } ! #else ! int roadmap_net_unique_id(unsigned char *buffer, unsigned int size) ! { ! return 16; } #endif --- 358,366 ---- return -1; ! } ! #else ! int roadmap_net_unique_id(unsigned char *buffer, unsigned int size) ! { ! return 16; } #endif |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:17:20
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11929 Modified Files: roadmap_win32.h time.c Log Message: Fix time parsing in NMEA to return UTC time. Index: time.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/time.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** time.c 17 Dec 2005 22:00:08 -0000 1.3 --- time.c 14 Oct 2006 09:17:15 -0000 1.4 *************** *** 84,93 **** ! static int get_bias() { TIME_ZONE_INFORMATION tzi; ! if (GetTimeZoneInformation(&tzi) == TIME_ZONE_ID_DAYLIGHT) { return tzi.Bias + tzi.DaylightBias; ! } else { return tzi.Bias; } --- 84,95 ---- ! static int get_bias(int *is_dst) { TIME_ZONE_INFORMATION tzi; ! if (GetTimeZoneInformation(&tzi) == TIME_ZONE_ID_DAYLIGHT) { ! *is_dst = 1; return tzi.Bias + tzi.DaylightBias; ! } else { ! *is_dst = 0; return tzi.Bias; } *************** *** 97,103 **** unsigned long mktime(struct tm *_tm) ! { return _mktime(_tm->tm_year + 1900, _tm->tm_mon + 1, _tm->tm_mday, _tm->tm_hour, ! _tm->tm_min, _tm->tm_sec) + get_bias() * 60; } --- 99,107 ---- unsigned long mktime(struct tm *_tm) ! { ! int is_dst; ! return _mktime(_tm->tm_year + 1900, _tm->tm_mon + 1, _tm->tm_mday, _tm->tm_hour, ! _tm->tm_min, _tm->tm_sec) + get_bias(&is_dst) * 60; } *************** *** 182,188 **** { static struct tm t; ! __offtime(timep, -get_bias() * 60, &t); ! t.tm_isdst = 1; return &t; } --- 186,197 ---- { static struct tm t; ! __offtime(timep, -get_bias(&t.tm_isdst) * 60, &t); ! //t.tm_isdst = 1; return &t; } + time_t timegm(struct tm *_tm) + { + return _mktime(_tm->tm_year + 1900, _tm->tm_mon + 1, _tm->tm_mday, _tm->tm_hour, + _tm->tm_min, _tm->tm_sec); + } \ No newline at end of file Index: roadmap_win32.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_win32.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_win32.h 18 Aug 2006 17:58:25 -0000 1.8 --- roadmap_win32.h 14 Oct 2006 09:17:15 -0000 1.9 *************** *** 29,32 **** --- 29,34 ---- char* ConvertToMultiByte(const LPCWSTR s, UINT nCodePage); const char *roadmap_main_get_virtual_serial (void); + + time_t timegm(struct tm *_tm); #endif /* _ROADMAP_WIN32_H_ */ |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:16:30
|
Update of /cvsroot/roadmap/roadmap_editor/src/unix In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11545 Modified Files: roadmap_net.c Log Message: Add wait parameter to roadmap_net_send Index: roadmap_net.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_net.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_net.c 16 Jul 2006 12:26:13 -0000 1.2 --- roadmap_net.c 14 Oct 2006 09:16:27 -0000 1.3 *************** *** 154,166 **** ! int roadmap_net_send (RoadMapSocket s, const void *data, int length) { ! int sent = write ((int)s, data, length); ! if (sent != length) { ! return -1; } ! return sent; } --- 154,200 ---- ! int roadmap_net_send (RoadMapSocket s, const void *data, int length, int wait) { ! int total = length; ! fd_set fds; ! struct timeval recv_timeout = {0, 0}; ! FD_ZERO(&fds); ! FD_SET(s, &fds); ! ! if (wait) { ! recv_timeout.tv_sec = 60; } ! while (length > 0) { ! int res; ! ! res = select(s+1, NULL, &fds, NULL, &recv_timeout); ! ! if(!res) { ! roadmap_log (ROADMAP_ERROR, ! "Timeout waiting for select in roadmap_net_send"); ! if (!wait) return 0; ! else return -1; ! } ! ! if(res < 0) { ! roadmap_log (ROADMAP_ERROR, ! "Error waiting on select in roadmap_net_send"); ! return -1; ! } ! ! res = send(s, data, length, 0); ! ! if (res < 0) { ! roadmap_log (ROADMAP_ERROR, "Error sending data"); ! return -1; ! } ! ! length -= res; ! data = (char *)data + res; ! } ! ! return total; } |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:15:57
|
Update of /cvsroot/roadmap/roadmap_editor/src/sound In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11137 Modified Files: 200.wav 800.wav Arrive.wav KeepLeft.wav KeepRight.wav m.wav Straight.wav TurnLeft.wav TurnRight.wav within.wav Log Message: Import Amir's voices. Index: TurnRight.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/TurnRight.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsYEtGQS and /tmp/cvs6rOhVs differ Index: Arrive.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/Arrive.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsTRI09R and /tmp/cvs3Ty7hs differ Index: KeepLeft.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/KeepLeft.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvscfbZaU and /tmp/cvsMlA9lu differ Index: within.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/within.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs52hCiY and /tmp/cvsdQLewy differ Index: Straight.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/Straight.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsw5PjVY and /tmp/cvsqtEmez differ Index: TurnLeft.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/TurnLeft.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsuR2Tc3 and /tmp/cvsm2XAyD differ Index: 800.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/800.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvso1uVF4 and /tmp/cvsMWnh4E differ Index: m.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/m.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvssLaS23 and /tmp/cvsCFmLtE differ Index: KeepRight.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/KeepRight.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsPv1WD7 and /tmp/cvsAllB7H differ Index: 200.wav =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/sound/200.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs2Z46t9 and /tmp/cvssZMs0J differ |
|
From: Ehud S. <esh...@us...> - 2006-10-14 09:12:42
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/export In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9985 Modified Files: editor_upload.c Log Message: Fix time parsing in NMEA to return UTC time. Index: editor_upload.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/export/editor_upload.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** editor_upload.c 17 Sep 2006 18:19:35 -0000 1.7 --- editor_upload.c 14 Oct 2006 09:12:37 -0000 1.8 *************** *** 158,162 **** length = strlen(buffer); ! if (roadmap_net_send (socket, buffer, length) != length) { error ("send error on: %s", buffer); return -1; --- 158,162 ---- length = strlen(buffer); ! if (roadmap_net_send (socket, buffer, length, 1) != length) { error ("send error on: %s", buffer); return -1; *************** *** 483,487 **** uploaded = roadmap_file_read (file, buffer, sizeof(buffer)); ! uploaded = roadmap_net_send (fd, buffer, uploaded); if (uploaded <= 0) { --- 483,487 ---- uploaded = roadmap_file_read (file, buffer, sizeof(buffer)); ! uploaded = roadmap_net_send (fd, buffer, uploaded, 1); if (uploaded <= 0) { |
Update of /cvsroot/roadmap/roadmap_editor/src/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9578 Added Files: ChangeLog FAQ INDEX Makefile Makefile.in README adler32.c algorithm.txt compress.c configure crc32.c crc32.h deflate.c deflate.h example.c gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h minigzip.c trees.c trees.h uncompr.c zconf.h zconf.in.h zlib.3 zlib.h zlib.vcp zutil.c zutil.h Log Message: Import zlib. --- NEW FILE: inffast.h --- /* inffast.h -- header to use inffast.c * Copyright (C) 1995-2003 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is subject to change. Applications should only use zlib.h. */ void inflate_fast OF((z_streamp strm, unsigned start)); --- NEW FILE: INDEX --- ChangeLog history of changes FAQ Frequently Asked Questions about zlib INDEX this file Makefile makefile for Unix (generated by configure) Makefile.in makefile for Unix (template for configure) README guess what algorithm.txt description of the (de)compression algorithm configure configure script for Unix zconf.in.h template for zconf.h (used by configure) amiga/ makefiles for Amiga SAS C as400/ makefiles for IBM AS/400 msdos/ makefiles for MSDOS old/ makefiles for various architectures and zlib documentation files that have not yet been updated for zlib 1.2.x projects/ projects for various Integrated Development Environments qnx/ makefiles for QNX win32/ makefiles for Windows zlib public header files (must be kept): zconf.h zlib.h private source files used to build the zlib library: adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zutil.c zutil.h source files for sample programs: example.c minigzip.c unsupported contribution by third parties See contrib/README.contrib --- NEW FILE: trees.h --- /* header created automatically with -DGEN_TREES_H */ local const ct_data static_ltree[L_CODES+2] = { {{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, {{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, {{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, {{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, {{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, {{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, {{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, {{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, {{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, {{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, {{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, {{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, {{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, {{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, {{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, {{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, {{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, {{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, {{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, {{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, {{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, {{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, {{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, {{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, {{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, {{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, {{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, {{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, {{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, {{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, {{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, {{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, {{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, {{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, {{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, {{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, {{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, {{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, {{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, {{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, {{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, {{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, {{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, {{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, {{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, {{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, {{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, {{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, {{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, {{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, {{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, {{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, {{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, {{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, {{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, {{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, {{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, {{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} }; local const ct_data static_dtree[D_CODES] = { {{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, {{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, {{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, {{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, {{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} }; const uch _dist_code[DIST_CODE_LEN] = { 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, 18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 }; const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 }; local const int base_length[LENGTH_CODES] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0 }; local const int base_dist[D_CODES] = { 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 }; --- NEW FILE: inftrees.h --- /* inftrees.h -- header to use inftrees.c * Copyright (C) 1995-2005 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is subject to change. Applications should only use zlib.h. */ /* Structure for decoding tables. Each entry provides either the information needed to do the operation requested by the code that indexed that table entry, or it provides a pointer to another table that indexes more bits of the code. op indicates whether the entry is a pointer to another table, a literal, a length or distance, an end-of-block, or an invalid code. For a table pointer, the low four bits of op is the number of index bits of that table. For a length or distance, the low four bits of op is the number of extra bits to get after the code. bits is the number of bits in this code or part of the code to drop off of the bit buffer. val is the actual byte to output in the case of a literal, the base length or distance, or the offset from the current table to the next table. Each entry is four bytes. */ typedef struct { unsigned char op; /* operation, extra bits, table bits */ unsigned char bits; /* bits in this part of the code */ unsigned short val; /* offset in table or code value */ } code; /* op values as set by inflate_table(): 00000000 - literal 0000tttt - table link, tttt != 0 is the number of table index bits 0001eeee - length or distance, eeee is the number of extra bits 01100000 - end of block 01000000 - invalid code */ /* Maximum size of dynamic tree. The maximum found in a long but non- exhaustive search was 1444 code structures (852 for length/literals and 592 for distances, the latter actually the result of an exhaustive search). The true maximum is not known, but the value below is more than safe. */ #define ENOUGH 2048 #define MAXD 592 /* Type of code to build for inftable() */ typedef enum { CODES, LENS, DISTS } codetype; extern int inflate_table OF((codetype type, unsigned short FAR *lens, unsigned codes, code FAR * FAR *table, unsigned FAR *bits, unsigned short FAR *work)); --- NEW FILE: Makefile.in --- # Makefile for zlib # Copyright (C) 1995-2005 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: # ./configure; make test # The call of configure is optional if you don't have special requirements # If you wish to build zlib as a shared library, use: ./configure -s # To use the asm code, type: # cp contrib/asm?86/match.S ./match.S # make LOC=-DASMV OBJA=match.o # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: # make install # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME CC=cc CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ # -Wstrict-prototypes -Wmissing-prototypes LDFLAGS=libz.a LDSHARED=$(CC) CPP=$(CC) -E LIBS=libz.a SHAREDLIB=libz.so SHAREDLIBV=libz.so.1.2.3 SHAREDLIBM=libz.so.1 AR=ar rc RANLIB=ranlib TAR=tar SHELL=/bin/sh EXE= prefix = /usr/local exec_prefix = ${prefix} libdir = ${exec_prefix}/lib includedir = ${prefix}/include mandir = ${prefix}/share/man man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o OBJA = # to use the asm code: make OBJA=match.o TEST_OBJS = example.o minigzip.o all: example$(EXE) minigzip$(EXE) check: test test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ echo hello world | ./minigzip | ./minigzip -d || \ echo ' *** minigzip test FAILED ***' ; \ if ./example; then \ echo ' *** zlib test OK ***'; \ else \ echo ' *** zlib test FAILED ***'; \ fi libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 match.o: match.S $(CPP) match.S > _match.s $(CC) -c _match.s mv _match.o match.o rm -f _match.s $(SHAREDLIBV): $(OBJS) $(LDSHARED) -o $@ $(OBJS) rm -f $(SHAREDLIB) $(SHAREDLIBM) ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIBM) example$(EXE): example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) minigzip$(EXE): minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h cp $(LIBS) $(libdir) cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 cd $(libdir); if test -f $(SHAREDLIBV); then \ rm -f $(SHAREDLIB) $(SHAREDLIBM); \ ln -s $(SHAREDLIBV) $(SHAREDLIB); \ ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ (ldconfig || true) >/dev/null 2>&1; \ fi cp zlib.3 $(man3dir) chmod 644 $(man3dir)/zlib.3 # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux uninstall: cd $(includedir); \ cd $(libdir); rm -f libz.a; \ if test -f $(SHAREDLIBV); then \ rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ fi cd $(man3dir); rm -f zlib.3 mostlyclean: clean clean: rm -f *.o *~ example$(EXE) minigzip$(EXE) \ libz.* foo.gz so_locations \ _match.s maketree contrib/infback9/*.o maintainer-clean: distclean distclean: clean cp -p Makefile.in Makefile cp -p zconf.in.h zconf.h rm -f .DS_Store tags: etags *.[ch] depend: makedepend -- $(CFLAGS) -- *.[ch] # DO NOT DELETE THIS LINE -- make depend depends on it. adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h crc32.o: crc32.h zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h uncompr.o: zlib.h zconf.h zutil.o: zutil.h zlib.h zconf.h --- NEW FILE: trees.c --- /* trees.c -- output deflated data using Huffman coding * Copyright (C) 1995-2005 Jean-loup Gailly * For conditions of distribution and use, see copyright notice in zlib.h */ /* * ALGORITHM * * The "deflation" process uses several Huffman trees. The more * common source values are represented by shorter bit sequences. * * Each code tree is stored in a compressed form which is itself * a Huffman encoding of the lengths of all the code strings (in * ascending order by source values). The actual code strings are * reconstructed from the lengths in the inflate process, as described * in the deflate specification. * * REFERENCES * [...1180 lines suppressed...] unsigned len; /* its length */ int header; /* true if block header must be written */ { bi_windup(s); /* align on byte boundary */ s->last_eob_len = 8; /* enough lookahead for inflate */ if (header) { put_short(s, (ush)len); put_short(s, (ush)~len); #ifdef DEBUG s->bits_sent += 2*16; #endif } #ifdef DEBUG s->bits_sent += (ulg)len<<3; #endif while (len--) { put_byte(s, *buf++); } } --- NEW FILE: inffast.c --- /* inffast.c -- fast decoding * Copyright (C) 1995-2004 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "zutil.h" #include "inftrees.h" #include "inflate.h" #include "inffast.h" #ifndef ASMINF /* Allow machine dependent optimization for post-increment or pre-increment. Based on testing to date, Pre-increment preferred for: - PowerPC G3 (Adler) - MIPS R5000 (Randers-Pehrson) Post-increment preferred for: - none No measurable difference: - Pentium III (Anderson) - M68060 (Nikl) */ #ifdef POSTINC # define OFF 0 # define PUP(a) *(a)++ #else # define OFF 1 # define PUP(a) *++(a) #endif /* Decode literal, length, and distance codes and write out the resulting literal and match bytes until either not enough input or output is available, an end-of-block is encountered, or a data error is encountered. When large enough input and output buffers are supplied to inflate(), for example, a 16K input buffer and a 64K output buffer, more than 95% of the inflate execution time is spent in this routine. Entry assumptions: state->mode == LEN strm->avail_in >= 6 strm->avail_out >= 258 start >= strm->avail_out state->bits < 8 On return, state->mode is one of: LEN -- ran out of enough output space or enough available input TYPE -- reached end of block code, inflate() to interpret next block BAD -- error in block data Notes: - The maximum input bits used by a length/distance pair is 15 bits for the length code, 5 bits for the length extra, 15 bits for the distance code, and 13 bits for the distance extra. This totals 48 bits, or six bytes. Therefore if strm->avail_in >= 6, then there is enough input to avoid checking for available input while decoding. - The maximum bytes that a single length/distance pair can output is 258 bytes, which is the maximum length that can be coded. inflate_fast() requires strm->avail_out >= 258 for each loop to avoid checking for output space. */ void inflate_fast(strm, start) z_streamp strm; unsigned start; /* inflate()'s starting value for strm->avail_out */ { struct inflate_state FAR *state; unsigned char FAR *in; /* local strm->next_in */ unsigned char FAR *last; /* while in < last, enough input available */ unsigned char FAR *out; /* local strm->next_out */ unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ unsigned char FAR *end; /* while out < end, enough space available */ #ifdef INFLATE_STRICT unsigned dmax; /* maximum distance from zlib header */ #endif unsigned wsize; /* window size or zero if not using window */ unsigned whave; /* valid bytes in the window */ unsigned write; /* window write index */ unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ unsigned long hold; /* local strm->hold */ unsigned bits; /* local strm->bits */ code const FAR *lcode; /* local strm->lencode */ code const FAR *dcode; /* local strm->distcode */ unsigned lmask; /* mask for first level of length codes */ unsigned dmask; /* mask for first level of distance codes */ code this; /* retrieved table entry */ unsigned op; /* code bits, operation, extra bits, or */ /* window position, window bytes to copy */ unsigned len; /* match length, unused bytes */ unsigned dist; /* match distance */ unsigned char FAR *from; /* where to copy match from */ /* copy state to local variables */ state = (struct inflate_state FAR *)strm->state; in = strm->next_in - OFF; last = in + (strm->avail_in - 5); out = strm->next_out - OFF; beg = out - (start - strm->avail_out); end = out + (strm->avail_out - 257); #ifdef INFLATE_STRICT dmax = state->dmax; #endif wsize = state->wsize; whave = state->whave; write = state->write; window = state->window; hold = state->hold; bits = state->bits; lcode = state->lencode; dcode = state->distcode; lmask = (1U << state->lenbits) - 1; dmask = (1U << state->distbits) - 1; /* decode literals and length/distances until end-of-block or not enough input data or output space */ do { if (bits < 15) { hold += (unsigned long)(PUP(in)) << bits; bits += 8; hold += (unsigned long)(PUP(in)) << bits; bits += 8; } this = lcode[hold & lmask]; dolen: op = (unsigned)(this.bits); hold >>= op; bits -= op; op = (unsigned)(this.op); if (op == 0) { /* literal */ Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ? "inflate: literal '%c'\n" : "inflate: literal 0x%02x\n", this.val)); PUP(out) = (unsigned char)(this.val); } else if (op & 16) { /* length base */ len = (unsigned)(this.val); op &= 15; /* number of extra bits */ if (op) { if (bits < op) { hold += (unsigned long)(PUP(in)) << bits; bits += 8; } len += (unsigned)hold & ((1U << op) - 1); hold >>= op; bits -= op; } Tracevv((stderr, "inflate: length %u\n", len)); if (bits < 15) { hold += (unsigned long)(PUP(in)) << bits; bits += 8; hold += (unsigned long)(PUP(in)) << bits; bits += 8; } this = dcode[hold & dmask]; dodist: op = (unsigned)(this.bits); hold >>= op; bits -= op; op = (unsigned)(this.op); if (op & 16) { /* distance base */ dist = (unsigned)(this.val); op &= 15; /* number of extra bits */ if (bits < op) { hold += (unsigned long)(PUP(in)) << bits; bits += 8; if (bits < op) { hold += (unsigned long)(PUP(in)) << bits; bits += 8; } } dist += (unsigned)hold & ((1U << op) - 1); #ifdef INFLATE_STRICT if (dist > dmax) { strm->msg = (char *)"invalid distance too far back"; state->mode = BAD; break; } #endif hold >>= op; bits -= op; Tracevv((stderr, "inflate: distance %u\n", dist)); op = (unsigned)(out - beg); /* max distance in output */ if (dist > op) { /* see if copy from window */ op = dist - op; /* distance back in window */ if (op > whave) { strm->msg = (char *)"invalid distance too far back"; state->mode = BAD; break; } from = window - OFF; if (write == 0) { /* very common case */ from += wsize - op; if (op < len) { /* some from window */ len -= op; do { PUP(out) = PUP(from); } while (--op); from = out - dist; /* rest from output */ } } else if (write < op) { /* wrap around window */ from += wsize + write - op; op -= write; if (op < len) { /* some from end of window */ len -= op; do { PUP(out) = PUP(from); } while (--op); from = window - OFF; if (write < len) { /* some from start of window */ op = write; len -= op; do { PUP(out) = PUP(from); } while (--op); from = out - dist; /* rest from output */ } } } else { /* contiguous in window */ from += write - op; if (op < len) { /* some from window */ len -= op; do { PUP(out) = PUP(from); } while (--op); from = out - dist; /* rest from output */ } } while (len > 2) { PUP(out) = PUP(from); PUP(out) = PUP(from); PUP(out) = PUP(from); len -= 3; } if (len) { PUP(out) = PUP(from); if (len > 1) PUP(out) = PUP(from); } } else { from = out - dist; /* copy direct from output */ do { /* minimum length is three */ PUP(out) = PUP(from); PUP(out) = PUP(from); PUP(out) = PUP(from); len -= 3; } while (len > 2); if (len) { PUP(out) = PUP(from); if (len > 1) PUP(out) = PUP(from); } } } else if ((op & 64) == 0) { /* 2nd level distance code */ this = dcode[this.val + (hold & ((1U << op) - 1))]; goto dodist; } else { strm->msg = (char *)"invalid distance code"; state->mode = BAD; break; } } else if ((op & 64) == 0) { /* 2nd level length code */ this = lcode[this.val + (hold & ((1U << op) - 1))]; goto dolen; } else if (op & 32) { /* end-of-block */ Tracevv((stderr, "inflate: end of block\n")); state->mode = TYPE; break; } else { strm->msg = (char *)"invalid literal/length code"; state->mode = BAD; break; } } while (in < last && out < end); /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ len = bits >> 3; in -= len; bits -= len << 3; hold &= (1U << bits) - 1; /* update state and return */ strm->next_in = in + OFF; strm->next_out = out + OFF; strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); strm->avail_out = (unsigned)(out < end ? 257 + (end - out) : 257 - (out - end)); state->hold = hold; state->bits = bits; return; } /* inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): - Using bit fields for code structure - Different op definition to avoid & for extra bits (do & for table bits) - Three separate decoding do-loops for direct, window, and write == 0 - Special case for distance > 1 copies to do overlapped load and store copy - Explicit branch predictions (based on measured branch probabilities) - Deferring match copy and interspersed it with decoding subsequent codes - Swapping literal/length else - Swapping window/direct else - Larger unrolled copy loops (three is about right) - Moving len -= 3 statement into middle of loop */ #endif /* !ASMINF */ --- NEW FILE: Makefile --- # Makefile for zlib # Copyright (C) 1995-2005 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: # ./configure; make test # The call of configure is optional if you don't have special requirements # If you wish to build zlib as a shared library, use: ./configure -s # To use the asm code, type: # cp contrib/asm?86/match.S ./match.S # make LOC=-DASMV OBJA=match.o # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: # make install # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME CC=cc CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ # -Wstrict-prototypes -Wmissing-prototypes LDFLAGS=libz.a LDSHARED=$(CC) CPP=$(CC) -E LIBS=libz.a SHAREDLIB=libz.so SHAREDLIBV=libz.so.1.2.3 SHAREDLIBM=libz.so.1 AR=ar rc RANLIB=ranlib TAR=tar SHELL=/bin/sh EXE= prefix = /usr/local exec_prefix = ${prefix} libdir = ${exec_prefix}/lib includedir = ${prefix}/include mandir = ${prefix}/share/man man3dir = ${mandir}/man3 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o OBJA = # to use the asm code: make OBJA=match.o TEST_OBJS = example.o minigzip.o all: example$(EXE) minigzip$(EXE) check: test test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ echo hello world | ./minigzip | ./minigzip -d || \ echo ' *** minigzip test FAILED ***' ; \ if ./example; then \ echo ' *** zlib test OK ***'; \ else \ echo ' *** zlib test FAILED ***'; \ fi libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 match.o: match.S $(CPP) match.S > _match.s $(CC) -c _match.s mv _match.o match.o rm -f _match.s $(SHAREDLIBV): $(OBJS) $(LDSHARED) -o $@ $(OBJS) rm -f $(SHAREDLIB) $(SHAREDLIBM) ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIBM) example$(EXE): example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) minigzip$(EXE): minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi -@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi -@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi -@if [ ! -d $(man3dir) ]; then mkdir -p $(man3dir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h cp $(LIBS) $(libdir) cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 cd $(libdir); if test -f $(SHAREDLIBV); then \ rm -f $(SHAREDLIB) $(SHAREDLIBM); \ ln -s $(SHAREDLIBV) $(SHAREDLIB); \ ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ (ldconfig || true) >/dev/null 2>&1; \ fi cp zlib.3 $(man3dir) chmod 644 $(man3dir)/zlib.3 # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux uninstall: cd $(includedir); \ cd $(libdir); rm -f libz.a; \ if test -f $(SHAREDLIBV); then \ rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ fi cd $(man3dir); rm -f zlib.3 mostlyclean: clean clean: rm -f *.o *~ example$(EXE) minigzip$(EXE) \ libz.* foo.gz so_locations \ _match.s maketree contrib/infback9/*.o maintainer-clean: distclean distclean: clean cp -p Makefile.in Makefile cp -p zconf.in.h zconf.h rm -f .DS_Store tags: etags *.[ch] depend: makedepend -- $(CFLAGS) -- *.[ch] # DO NOT DELETE THIS LINE -- make depend depends on it. adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h crc32.o: crc32.h zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h uncompr.o: zlib.h zconf.h zutil.o: zutil.h zlib.h zconf.h --- NEW FILE: uncompr.c --- /* uncompr.c -- decompress a memory buffer * Copyright (C) 1995-2003 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id: uncompr.c,v 1.3 2006/10/14 09:11:40 eshabtai Exp $ */ #define ZLIB_INTERNAL #include "zlib.h" /* =========================================================================== Decompresses the source buffer into the destination buffer. sourceLen is the byte length of the source buffer. Upon entry, destLen is the total size of the destination buffer, which must be large enough to hold the entire uncompressed data. (The size of the uncompressed data must have been saved previously by the compressor and transmitted to the decompressor by some mechanism outside the scope of this compression library.) Upon exit, destLen is the actual size of the compressed buffer. This function can be used to decompress a whole file at once if the input file is mmap'ed. uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR if there was not enough room in the output buffer, or Z_DATA_ERROR if the input data was corrupted. */ int ZEXPORT uncompress (dest, destLen, source, sourceLen) Bytef *dest; uLongf *destLen; const Bytef *source; uLong sourceLen; { z_stream stream; int err; stream.next_in = (Bytef*)source; stream.avail_in = (uInt)sourceLen; /* Check for source > 64K on 16-bit machine: */ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; stream.next_out = dest; stream.avail_out = (uInt)*destLen; if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; stream.zalloc = (alloc_func)0; stream.zfree = (free_func)0; err = inflateInit(&stream); if (err != Z_OK) return err; err = inflate(&stream, Z_FINISH); if (err != Z_STREAM_END) { inflateEnd(&stream); if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) return Z_DATA_ERROR; return err; } *destLen = stream.total_out; err = inflateEnd(&stream); return err; } --- NEW FILE: inftrees.c --- /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995-2005 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "zutil.h" #include "inftrees.h" #define MAXBITS 15 const char inflate_copyright[] = " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot include such an acknowledgment, I would appreciate that you keep this copyright string in the executable of your product. */ /* Build a set of tables to decode the provided canonical Huffman code. The code lengths are lens[0..codes-1]. The result starts at *table, whose indices are 0..2^bits-1. work is a writable array of at least lens shorts, which is used as a work area. type is the type of code to be generated, CODES, LENS, or DISTS. On return, zero is success, -1 is an invalid code, and +1 means that ENOUGH isn't enough. table on return points to the next available entry's address. bits is the requested root table index bits, and on return it is the actual root table index bits. It will differ if the request is greater than the longest code or if it is less than the shortest code. */ int inflate_table(type, lens, codes, table, bits, work) codetype type; unsigned short FAR *lens; unsigned codes; code FAR * FAR *table; unsigned FAR *bits; unsigned short FAR *work; { unsigned len; /* a code's length in bits */ unsigned sym; /* index of code symbols */ unsigned min, max; /* minimum and maximum code lengths */ unsigned root; /* number of index bits for root table */ unsigned curr; /* number of index bits for current table */ unsigned drop; /* code bits to drop for sub-table */ int left; /* number of prefix codes available */ unsigned used; /* code entries in table used */ unsigned huff; /* Huffman code */ unsigned incr; /* for incrementing code, index */ unsigned fill; /* index for replicating entries */ unsigned low; /* low bits for current root entry */ unsigned mask; /* mask for low root bits */ code this; /* table entry for duplication */ code FAR *next; /* next available space in table */ const unsigned short FAR *base; /* base value table to use */ const unsigned short FAR *extra; /* extra bits table to use */ int end; /* use base and extra for symbol > end */ unsigned short count[MAXBITS+1]; /* number of codes of each length */ unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ static const unsigned short lbase[31] = { /* Length codes 257..285 base */ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0}; static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, 29, 64, 64}; /* Process a set of code lengths to create a canonical Huffman code. The code lengths are lens[0..codes-1]. Each length corresponds to the symbols 0..codes-1. The Huffman code is generated by first sorting the symbols by length from short to long, and retaining the symbol order for codes with equal lengths. Then the code starts with all zero bits for the first code of the shortest length, and the codes are integer increments for the same length, and zeros are appended as the length increases. For the deflate format, these bits are stored backwards from their more natural integer increment ordering, and so when the decoding tables are built in the large loop below, the integer codes are incremented backwards. This routine assumes, but does not check, that all of the entries in lens[] are in the range 0..MAXBITS. The caller must assure this. 1..MAXBITS is interpreted as that code length. zero means that that symbol does not occur in this code. The codes are sorted by computing a count of codes for each length, creating from that a table of starting indices for each length in the sorted table, and then entering the symbols in order in the sorted table. The sorted table is work[], with that space being provided by the caller. The length counts are used for other purposes as well, i.e. finding the minimum and maximum length codes, determining if there are any codes at all, checking for a valid set of lengths, and looking ahead at length counts to determine sub-table sizes when building the decoding tables. */ /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ for (len = 0; len <= MAXBITS; len++) count[len] = 0; for (sym = 0; sym < codes; sym++) count[lens[sym]]++; /* bound code lengths, force root to be within code lengths */ root = *bits; for (max = MAXBITS; max >= 1; max--) if (count[max] != 0) break; if (root > max) root = max; if (max == 0) { /* no symbols to code at all */ this.op = (unsigned char)64; /* invalid code marker */ this.bits = (unsigned char)1; this.val = (unsigned short)0; *(*table)++ = this; /* make a table to force an error */ *(*table)++ = this; *bits = 1; return 0; /* no symbols, but wait for decoding to report error */ } for (min = 1; min <= MAXBITS; min++) if (count[min] != 0) break; if (root < min) root = min; /* check for an over-subscribed or incomplete set of lengths */ left = 1; for (len = 1; len <= MAXBITS; len++) { left <<= 1; left -= count[len]; if (left < 0) return -1; /* over-subscribed */ } if (left > 0 && (type == CODES || max != 1)) return -1; /* incomplete set */ /* generate offsets into symbol table for each length for sorting */ offs[1] = 0; for (len = 1; len < MAXBITS; len++) offs[len + 1] = offs[len] + count[len]; /* sort symbols by length, by symbol order within each length */ for (sym = 0; sym < codes; sym++) if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; /* Create and fill in decoding tables. In this loop, the table being filled is at next and has curr index bits. The code being used is huff with length len. That code is converted to an index by dropping drop bits off of the bottom. For codes where len is less than drop + curr, those top drop + curr - len bits are incremented through all values to fill the table with replicated entries. root is the number of index bits for the root table. When len exceeds root, sub-tables are created pointed to by the root entry with an index of the low root bits of huff. This is saved in low to check for when a new sub-table should be started. drop is zero when the root table is being filled, and drop is root when sub-tables are being filled. When a new sub-table is needed, it is necessary to look ahead in the code lengths to determine what size sub-table is needed. The length counts are used for this, and so count[] is decremented as codes are entered in the tables. used keeps track of how many table entries have been allocated from the provided *table space. It is checked when a LENS table is being made against the space in *table, ENOUGH, minus the maximum space needed by the worst case distance code, MAXD. This should never happen, but the sufficiency of ENOUGH has not been proven exhaustively, hence the check. This assumes that when type == LENS, bits == 9. sym increments through all symbols, and the loop terminates when all codes of length max, i.e. all codes, have been processed. This routine permits incomplete codes, so another loop after this one fills in the rest of the decoding tables with invalid code markers. */ /* set up for code type */ switch (type) { case CODES: base = extra = work; /* dummy value--not used */ end = 19; break; case LENS: base = lbase; base -= 257; extra = lext; extra -= 257; end = 256; break; default: /* DISTS */ base = dbase; extra = dext; end = -1; } /* initialize state for loop */ huff = 0; /* starting code */ sym = 0; /* starting code symbol */ len = min; /* starting code length */ next = *table; /* current table to fill in */ curr = root; /* current table index bits */ drop = 0; /* current bits to drop from code for index */ low = (unsigned)(-1); /* trigger new sub-table when len > root */ used = 1U << root; /* use root table entries */ mask = used - 1; /* mask for comparing low */ /* check available table space */ if (type == LENS && used >= ENOUGH - MAXD) return 1; /* process all codes and make table entries */ for (;;) { /* create table entry */ this.bits = (unsigned char)(len - drop); if ((int)(work[sym]) < end) { this.op = (unsigned char)0; this.val = work[sym]; } else if ((int)(work[sym]) > end) { this.op = (unsigned char)(extra[work[sym]]); this.val = base[work[sym]]; } else { this.op = (unsigned char)(32 + 64); /* end of block */ this.val = 0; } /* replicate for those indices with low len bits equal to huff */ incr = 1U << (len - drop); fill = 1U << curr; min = fill; /* save offset to next table */ do { fill -= incr; next[(huff >> drop) + fill] = this; } while (fill != 0); /* backwards increment the len-bit code huff */ incr = 1U << (len - 1); while (huff & incr) incr >>= 1; if (incr != 0) { huff &= incr - 1; huff += incr; } else huff = 0; /* go to next symbol, update count, len */ sym++; if (--(count[len]) == 0) { if (len == max) break; len = lens[work[sym]]; } /* create new sub-table if needed */ if (len > root && (huff & mask) != low) { /* if first time, transition to sub-tables */ if (drop == 0) drop = root; /* increment past last table */ next += min; /* here min is 1 << curr */ /* determine length of next table */ curr = len - drop; left = (int)(1 << curr); while (curr + drop < max) { left -= count[curr + drop]; if (left <= 0) break; curr++; left <<= 1; } /* check for enough space */ used += 1U << curr; if (type == LENS && used >= ENOUGH - MAXD) return 1; /* point entry in root table to sub-table */ low = huff & mask; (*table)[low].op = (unsigned char)curr; (*table)[low].bits = (unsigned char)root; (*table)[low].val = (unsigned short)(next - *table); } } /* Fill in rest of table for incomplete codes. This loop is similar to the loop above in incrementing huff for table indices. It is assumed that len is equal to curr + drop, so there is no loop needed to increment through high index bits. When the current sub-table is filled, the loop drops back to the root table to fill in any remaining entries there. */ this.op = (unsigned char)64; /* invalid code marker */ this.bits = (unsigned char)(len - drop); this.val = (unsigned short)0; while (huff != 0) { /* when done with sub-table, drop back to root table */ if (drop != 0 && (huff & mask) != low) { drop = 0; len = root; next = *table; this.bits = (unsigned char)len; } /* put invalid code marker in table */ next[huff >> drop] = this; /* backwards increment the len-bit code huff */ incr = 1U << (len - 1); while (huff & incr) incr >>= 1; if (incr != 0) { huff &= incr - 1; huff += incr; } else huff = 0; } /* set return parameters */ *table += used; *bits = root; return 0; } --- NEW FILE: zutil.h --- /* zutil.h -- internal interface and configuration of the compression library * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is subject to change. Applications should only use zlib.h. */ /* @(#) $Id: zutil.h,v 1.3 2006/10/14 09:11:40 eshabtai Exp $ */ #ifndef ZUTIL_H #define ZUTIL_H #define ZLIB_INTERNAL #include "zlib.h" #ifdef STDC # ifndef _WIN32_WCE # include <stddef.h> # endif # include <string.h> # include <stdlib.h> #endif #ifdef NO_ERRNO_H # ifdef _WIN32_WCE /* The Microsoft C Run-Time Library for Windows CE doesn't have * errno. We define it as a global variable to simplify porting. * Its value is always 0 and should not be used. We rename it to * avoid conflict with other libraries that use the same workaround. */ # define errno z_errno # endif extern int errno; #else # ifndef _WIN32_WCE # include <errno.h> # endif #endif #ifndef local # define local static #endif /* compile with -Dlocal if your debugger can't find static symbols */ typedef unsigned char uch; typedef uch FAR uchf; typedef unsigned short ush; typedef ush FAR ushf; typedef unsigned long ulg; extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ return (strm->msg = (char*)ERR_MSG(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */ #ifndef DEF_WBITS # define DEF_WBITS MAX_WBITS #endif /* default windowBits for decompression. MAX_WBITS is for compression only */ #if MAX_MEM_LEVEL >= 8 # define DEF_MEM_LEVEL 8 #else # define DEF_MEM_LEVEL MAX_MEM_LEVEL #endif /* default memLevel */ #define STORED_BLOCK 0 #define STATIC_TREES 1 #define DYN_TREES 2 /* The three kinds of block type */ #define MIN_MATCH 3 #define MAX_MATCH 258 /* The minimum and maximum match lengths */ #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ /* target dependencies */ #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) # define OS_CODE 0x00 # if defined(__TURBOC__) || defined(__BORLANDC__) # if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) /* Allow compilation with ANSI keywords only enabled */ void _Cdecl farfree( void *block ); void *_Cdecl farmalloc( unsigned long nbytes ); # else # include <alloc.h> # endif # else /* MSC or DJGPP */ # include <malloc.h> # endif #endif #ifdef AMIGA # define OS_CODE 0x01 #endif #if defined(VAXC) || defined(VMS) # define OS_CODE 0x02 # define F_OPEN(name, mode) \ fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") #endif #if defined(ATARI) || defined(atarist) # define OS_CODE 0x05 #endif #ifdef OS2 # define OS_CODE 0x06 # ifdef M_I86 #include <malloc.h> # endif #endif #if defined(MACOS) || defined(TARGET_OS_MAC) # define OS_CODE 0x07 # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os # include <unix.h> /* for fdopen */ # else # ifndef fdopen # define fdopen(fd,mode) NULL /* No fdopen() */ # endif # endif #endif #ifdef TOPS20 # define OS_CODE 0x0a #endif #ifdef WIN32 # ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ # define OS_CODE 0x0b # endif #endif #ifdef __50SERIES /* Prime/PRIMOS */ # define OS_CODE 0x0f #endif #if defined(_BEOS_) || defined(RISCOS) # define fdopen(fd,mode) NULL /* No fdopen() */ #endif #if (defined(_MSC_VER) && (_MSC_VER > 600)) # if defined(_WIN32_WCE) # define fdopen(fd,mode) NULL /* No fdopen() */ # ifndef _PTRDIFF_T_DEFINED typedef int ptrdiff_t; # define _PTRDIFF_T_DEFINED # endif # else # define fdopen(fd,type) _fdopen(fd,type) # endif #endif /* common defaults */ #ifndef OS_CODE # define OS_CODE 0x03 /* assume Unix */ #endif #ifndef F_OPEN # define F_OPEN(name, mode) fopen((name), (mode)) #endif /* functions */ #if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) # ifndef HAVE_VSNPRINTF # define HAVE_VSNPRINTF # endif #endif #if defined(__CYGWIN__) # ifndef HAVE_VSNPRINTF # define HAVE_VSNPRINTF # endif #endif #ifndef HAVE_VSNPRINTF # ifdef MSDOS /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), but for now we just assume it doesn't. */ # define NO_vsnprintf # endif # ifdef __TURBOC__ # define NO_vsnprintf # endif # ifdef WIN32 /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ # if !defined(vsnprintf) && !defined(NO_vsnprintf) # define vsnprintf _vsnprintf # endif # endif # ifdef __SASC # define NO_vsnprintf # endif #endif #ifdef VMS # define NO_vsnprintf #endif #if defined(pyr) # define NO_MEMCPY #endif #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) /* Use our own functions for small and medium model with MSC <= 5.0. * You may have to use the same strategy for Borland C (untested). * The __SC__ check is for Symantec. */ # define NO_MEMCPY #endif #if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) # define HAVE_MEMCPY #endif #ifdef HAVE_MEMCPY # ifdef SMALL_MEDIUM /* MSDOS small or medium model */ # define zmemcpy _fmemcpy # define zmemcmp _fmemcmp # define zmemzero(dest, len) _fmemset(dest, 0, len) # else # define zmemcpy memcpy # define zmemcmp memcmp # define zmemzero(dest, len) memset(dest, 0, len) # endif #else extern void zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); extern int zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); extern void zmemzero OF((Bytef* dest, uInt len)); #endif /* Diagnostic functions */ #ifdef DEBUG # include <stdio.h> extern int z_verbose; extern void z_error OF((char *m)); # define Assert(cond,msg) {if(!(cond)) z_error(msg);} # define Trace(x) {if (z_verbose>=0) fprintf x ;} # define Tracev(x) {if (z_verbose>0) fprintf x ;} # define Tracevv(x) {if (z_verbose>1) fprintf x ;} # define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} # define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} #else # define Assert(cond,msg) # define Trace(x) # define Tracev(x) # define Tracevv(x) # define Tracec(c,x) # define Tracecv(c,x) #endif voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size)); void zcfree OF((voidpf opaque, voidpf ptr)); #define ZALLOC(strm, items, size) \ (*((strm)->zalloc))((strm)->opaque, (items), (size)) #define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) #define TRY_FREE(s, p) {if (p) ZFREE(s, p);} #endif /* ZUTIL_H */ --- NEW FILE: infback.c --- /* infback.c -- inflate using a call-back interface * Copyright (C) 1995-2005 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* This code is largely copied from inflate.c. Normally either infback.o or inflate.o would be linked into an application--not both. The interface with inffast.c is retained so that optimized assembler-coded versions of inflate_fast() can be used with either inflate.c or infback.c. */ #include "zutil.h" #include "inftrees.h" #include "inflate.h" #include "inffast.h" /* function prototypes */ local void fixedtables OF((struct inflate_state FAR *state)); /* strm provides memory allocation functions in zalloc and zfree, or Z_NULL to use the library memory allocation functions. windowBits is in the range 8..15, and window is a user-supplied window and output buffer that is 2**windowBits bytes. */ int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) z_streamp strm; int windowBits; unsigned char FAR *window; const char *version; int stream_size; { struct inflate_state FAR *state; if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || stream_size != (int)(sizeof(z_stream))) return Z_VERSION_ERROR; if (strm == Z_NULL || window == Z_NULL || windowBits < 8 || windowBits > 15) return Z_STREAM_ERROR; strm->msg = Z_NULL; /* in case we return an error */ if (strm->zalloc == (alloc_func)0) { strm->zalloc = zcalloc; strm->opaque = (voidpf)0; } if (strm->zfree == (free_func)0) strm->zfree = zcfree; state = (struct inflate_state FAR *)ZALLOC(strm, 1, sizeof(struct inflate_state)); if (state == Z_NULL) return Z_MEM_ERROR; Tracev((stderr, "inflate: allocated\n")); strm->state = (struct internal_state FAR *)state; state->dmax = 32768U; state->wbits = windowBits; state->wsize = 1U << windowBits; state->window = window; state->write = 0; state->whave = 0; return Z_OK; } /* Return state with length and distance decoding tables and index sizes set to fixed code decoding. Normally this returns fixed tables from inffixed.h. If BUILDFIXED is defined, then instead this routine builds the tables the first time it's called, and returns those tables the first time and thereafter. This reduces the size of the code by about 2K bytes, in exchange for a little execution time. However, BUILDFIXED should not be ... [truncated message content] |
Update of /cvsroot/roadmap/roadmap_editor/src/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8744 Removed Files: ChangeLog FAQ INDEX Make_vms.com Makefile Makefile.in Makefile.riscos README adler32.c algorithm.txt compress.c configure crc32.c deflate.c deflate.h descrip.mms example.c gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h maketree.c minigzip.c trees.c trees.h uncompr.c zconf.h zlib.3 zlib.h zlib.html zutil.c zutil.h Log Message: Remove old zlib. --- inffast.h DELETED --- --- descrip.mms DELETED --- --- trees.h DELETED --- --- inftrees.h DELETED --- --- infcodes.h DELETED --- --- INDEX DELETED --- --- Makefile.in DELETED --- --- zconf.h DELETED --- --- inffast.c DELETED --- --- Makefile DELETED --- --- infcodes.c DELETED --- --- inftrees.c DELETED --- --- Make_vms.com DELETED --- --- zutil.h DELETED --- --- zutil.c DELETED --- --- zlib.3 DELETED --- --- inflate.c DELETED --- --- infblock.c DELETED --- --- example.c DELETED --- --- FAQ DELETED --- --- infblock.h DELETED --- --- algorithm.txt DELETED --- --- deflate.c DELETED --- --- trees.c DELETED --- --- README DELETED --- --- zlib.html DELETED --- --- deflate.h DELETED --- --- uncompr.c DELETED --- --- configure DELETED --- --- zlib.h DELETED --- --- infutil.h DELETED --- --- crc32.c DELETED --- --- Makefile.riscos DELETED --- --- compress.c DELETED --- --- adler32.c DELETED --- --- maketree.c DELETED --- --- minigzip.c DELETED --- --- ChangeLog DELETED --- --- inffixed.h DELETED --- --- gzio.c DELETED --- --- infutil.c DELETED --- |
