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: Ehud S. <esh...@us...> - 2007-01-07 10:14:06
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/track In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6416/track Modified Files: editor_track_main.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: editor_track_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/track/editor_track_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** editor_track_main.c 24 Nov 2006 11:06:38 -0000 1.17 --- editor_track_main.c 7 Jan 2007 10:14:02 -0000 1.18 *************** *** 570,573 **** --- 570,575 ---- if (count) { + int num_points; + if ((point_id == 0) && TrackConfirmedStreet.valid) { cur_active_line = 0; *************** *** 588,594 **** --- 590,602 ---- */ + num_points = points_count; for (i=0; i<points_count; i++) { track_rec_locate_point (i, point_type); + if (points_count != num_points) { + // The inner call has created a new line and further processed + // all existing points. + break; + } } } |
|
From: Ehud S. <esh...@us...> - 2007-01-07 10:14:06
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/static In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6416/static Modified Files: edit_marker.c editor_dialog.c notes.c update_range.c Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: editor_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/editor_dialog.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** editor_dialog.c 24 Nov 2006 15:35:01 -0000 1.12 --- editor_dialog.c 7 Jan 2007 10:14:02 -0000 1.13 *************** *** 71,75 **** } DialogSelectedLines; ! static const char *def_values[2] = {"", ""}; static void editor_dialog_city_result (const char *result, void *data) { --- 71,75 ---- } DialogSelectedLines; ! static const char *def_values[3] = {"", "", ""}; static void editor_dialog_city_result (const char *result, void *data) { *************** *** 81,88 **** #endif ! if ((result == NULL) || !strlen (result)) return; #ifdef SSD ssd_dialog_set_value ("City", result); #else roadmap_dialog_set_data ("General", "City", result); --- 81,89 ---- #endif ! if (result == NULL) return; #ifdef SSD ssd_dialog_set_value ("City", result); + def_values[0] = ssd_dialog_get_value ("City"); #else roadmap_dialog_set_data ("General", "City", result); *************** *** 95,100 **** if (!strcmp(new_value, def_values[1])) { - ssd_dialog_set_value ("City", def_values[0]); - roadmap_address_search_dialog (NULL, editor_dialog_city_result, widget->context); --- 96,99 ---- *************** *** 103,106 **** --- 102,109 ---- } + // ssd_dialog_set_value ("City", new_value); + // def_values[0] = ssd_dialog_get_value ("City"); + def_values[0] = new_value; + return 1; } *************** *** 717,721 **** roadmap_street_get_properties (lines[i].line.line_id, &properties); ! this_name = roadmap_street_get_street_fename (&properties); this_type = roadmap_street_get_street_fetype (&properties); this_t2s = roadmap_street_get_street_t2s (&properties); --- 720,724 ---- roadmap_street_get_properties (lines[i].line.line_id, &properties); ! this_name = roadmap_street_get_street_name (&properties); this_type = roadmap_street_get_street_fetype (&properties); this_t2s = roadmap_street_get_street_t2s (&properties); *************** *** 878,881 **** --- 881,886 ---- } + def_values[0] = ssd_dialog_get_value ("City"); + #else roadmap_dialog_set_data *************** *** 1022,1025 **** --- 1027,1031 ---- #ifdef SSD ssd_dialog_set_value ("Time", str); + ssd_dialog_draw (); #else roadmap_dialog_set_data ("Info", "Time", str); Index: edit_marker.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/edit_marker.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit_marker.c 18 Aug 2006 17:47:35 -0000 1.1 --- edit_marker.c 7 Jan 2007 10:14:02 -0000 1.2 *************** *** 147,151 **** } else { ! roadmap_sound_play (file); } } --- 147,151 ---- } else { ! roadmap_sound_play_file (file); } } Index: notes.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/notes.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** notes.c 18 Aug 2006 17:48:17 -0000 1.1 --- notes.c 7 Jan 2007 10:14:02 -0000 1.2 *************** *** 243,247 **** switch (mode) { case NOTES_MODE_QUICK: ! roadmap_sound_play ("rec_end.wav"); break; case NOTES_MODE_VOICE: --- 243,247 ---- switch (mode) { case NOTES_MODE_QUICK: ! roadmap_sound_play_file ("rec_end.wav"); break; case NOTES_MODE_VOICE: *************** *** 261,265 **** roadmap_config_declare ! ("preferences", &ConfigVoiceLength, "10"); } --- 261,265 ---- roadmap_config_declare ! ("preferences", &ConfigVoiceLength, "10", NULL); } Index: update_range.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/editor/static/update_range.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** update_range.c 21 Nov 2006 09:28:10 -0000 1.4 --- update_range.c 7 Jan 2007 10:14:02 -0000 1.5 *************** *** 125,129 **** int *count) { ! char field[100]; const char *note = editor_marker_note (marker); *count = 0; --- 125,129 ---- int *count) { ! char field[255]; const char *note = editor_marker_note (marker); *count = 0; *************** *** 184,188 **** const char **note) { ! char field[100]; int found_update = 0; --- 184,188 ---- const char **note) { ! char field[255]; int found_update = 0; *************** *** 235,239 **** const char *city, const char *street) { ! char note[100]; int fips; --- 235,239 ---- const char *city, const char *street) { ! char note[500]; int fips; *************** *** 304,308 **** } ! ssd_keyboard_hide (SSD_KEYBOARD_DIGITS); return 1; } --- 304,308 ---- } ! ssd_keyboard_hide (); return 1; } *************** *** 333,337 **** ssd_keyboard_show (SSD_KEYBOARD_DIGITS, ! title, value, keyboard_callback, (void *)widget); return 1; --- 333,337 ---- ssd_keyboard_show (SSD_KEYBOARD_DIGITS, ! title, value, NULL, keyboard_callback, (void *)widget); return 1; *************** *** 386,390 **** /* Left side */ ! if (ssd_widget_rtl ()) { align = SSD_ALIGN_RIGHT; } --- 386,390 ---- /* Left side */ ! if (ssd_widget_rtl (NULL)) { align = SSD_ALIGN_RIGHT; } *************** *** 411,415 **** /* Right side */ ! if (ssd_widget_rtl ()) align = 0; else align = SSD_ALIGN_RIGHT; --- 411,415 ---- /* Right side */ ! if (ssd_widget_rtl (NULL)) align = 0; else align = SSD_ALIGN_RIGHT; *************** *** 433,437 **** ssd_widget_add (right, text); ! if (ssd_widget_rtl ()) { ssd_widget_add (dialog, right); ssd_widget_add (dialog, left); --- 433,437 ---- ssd_widget_add (right, text); ! if (ssd_widget_rtl (NULL)) { ssd_widget_add (dialog, right); ssd_widget_add (dialog, left); *************** *** 551,554 **** --- 551,557 ---- sprintf(str, "%d", right); ssd_dialog_set_value ("estimated_right", str); + ssd_dialog_set_value (UPDATE_LEFT, ""); + ssd_dialog_set_value (UPDATE_RIGHT, ""); + ssd_dialog_draw (); #endif return 0; *************** *** 624,628 **** create_ssd_dialog(); ssd_dialog_activate ("Update street range", NULL); - ssd_dialog_draw (); } #endif --- 627,630 ---- |
Update of /cvsroot/roadmap/roadmap_editor/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2206 Modified Files: buildmap_dictionary.c buildmap_postgres.c buildmap_shape.c dumpmap_main.c lang Makefile objects objects_wide quick.menu roadgps_logger.c roadgps_screen.c roadgps_screen.h roadgps_start.c roadmap_address.h roadmap_address_ssd.c roadmap_adjust.c roadmap_config.c roadmap_config.h roadmap_db_dictionary.h roadmap_dictionary.c roadmap_dictionary.h roadmap_display.c roadmap_download.c roadmap_driver.c roadmap_factory.c roadmap_fuzzy.c roadmap_geocode.c roadmap_gps.c roadmap_help.c roadmap_history.c roadmap_label.c roadmap_layer.c roadmap_locator.c roadmap_locator.h roadmap_math.c roadmap_option.c roadmap_res.c roadmap_res.h roadmap_screen.c roadmap_sound.h roadmap_start.c roadmap_start.h roadmap_street.c roadmap_street.h roadmap_trip.c roadmap_types.h roadmap_voice.c sprites Log Message: 0.9 updates: Add new road layers. Modify dictionary to allow searching for a word - a street name can now be found by any of its words. Fix valgrind errors and leaks. Index: buildmap_dictionary.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/buildmap_dictionary.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** buildmap_dictionary.c 1 Dec 2005 12:22:11 -0000 1.3 --- buildmap_dictionary.c 7 Jan 2007 10:01:12 -0000 1.4 *************** *** 341,344 **** --- 341,347 ---- buildmap_dictionary_fatal (dictionary, tree); } + if (reference->character == ' ') { + break; /* Keep space trees for word search. */ + } if (reference->type != ROADMAP_DICTIONARY_TREE) { break; /* Not a subtree: stop here. */ *************** *** 379,382 **** --- 382,386 ---- int *tree_cursor, int *reference_cursor, + int *num_strings, struct roadmap_dictionary_tree *db_tree, struct roadmap_dictionary_reference *db_reference) { *************** *** 388,391 **** --- 392,397 ---- struct dictionary_reference *reference; + *num_strings = 0; + /* Allocate space for this tree and its references: */ *************** *** 408,411 **** --- 414,419 ---- reference = reference->next) { + int subtrees_strings; + db_reference[this_reference].character = reference->character; db_reference[this_reference].type = reference->type; *************** *** 416,419 **** --- 424,428 ---- db_reference[this_reference].index = reference->child; + (*num_strings)++; break; *************** *** 425,430 **** db_reference[this_reference].index = buildmap_dictionary_save_subtree ! (dictionary, subtree, ! tree_cursor, reference_cursor, db_tree, db_reference); } --- 434,441 ---- db_reference[this_reference].index = buildmap_dictionary_save_subtree ! (dictionary, subtree, tree_cursor, reference_cursor, ! &subtrees_strings, db_tree, db_reference); ! ! *num_strings += subtrees_strings; } *************** *** 437,440 **** --- 448,459 ---- } + // We only user an unsigned char to store the number of strings, so only + // count up to 255 + if (*num_strings >= 255) { + db_tree[this_tree].num_strings = 255; + } else { + db_tree[this_tree].num_strings = *num_strings; + } + return this_tree; } *************** *** 447,450 **** --- 466,470 ---- int tree_count = 0; int reference_count = 0; + int strings_count = 0; buildmap_db *child; *************** *** 497,501 **** buildmap_dictionary_save_subtree (dictionary, dictionary->tree, ! &tree_count, &reference_count, db_tree, db_reference); memcpy (db_index, dictionary->string_index, --- 517,521 ---- buildmap_dictionary_save_subtree (dictionary, dictionary->tree, ! &tree_count, &reference_count, &strings_count, db_tree, db_reference); memcpy (db_index, dictionary->string_index, *************** *** 708,711 **** --- 728,751 ---- } + while (strchr(string + tree->position, ' ')) { + + int position = tree->position; + + buildmap_dictionary_add_reference + (dictionary, + tree, + string[position], ROADMAP_DICTIONARY_TREE, + dictionary->tree_count); + + tree = dictionary->tree + dictionary->tree_count; + tree->count = 0; + tree->first = NULL; + tree->position = position + 1; + + dictionary->tree_count++; + + character = string[tree->position]; + } + buildmap_dictionary_add_reference (dictionary, tree, Index: roadmap_display.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_display.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** roadmap_display.c 21 Nov 2006 09:22:08 -0000 1.11 --- roadmap_display.c 7 Jan 2007 10:01:12 -0000 1.12 *************** *** 721,736 **** roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayDuration, "10"); roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayBottomRight, "%D (%W)|%D"); roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayBottomLeft, "%S"); roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayTopRight, "ETA: %A|%T"); roadmap_config_declare ! ("schema", &RoadMapConfigConsoleBackground, "yellow"); roadmap_config_declare ! ("schema", &RoadMapConfigConsoleForeground, "black"); for (sign = RoadMapStreetSign; sign->title != NULL; ++sign) { --- 721,736 ---- roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayDuration, "10", NULL); roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayBottomRight, "%D (%W)|%D", NULL); roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayBottomLeft, "%S", NULL); roadmap_config_declare ! ("preferences", &RoadMapConfigDisplayTopRight, "ETA: %A|%T", NULL); roadmap_config_declare ! ("schema", &RoadMapConfigConsoleBackground, "yellow", NULL); roadmap_config_declare ! ("schema", &RoadMapConfigConsoleForeground, "black", NULL); for (sign = RoadMapStreetSign; sign->title != NULL; ++sign) { *************** *** 739,752 **** roadmap_config_declare ("preferences", ! &sign->format_descriptor, sign->default_format); } roadmap_config_declare ("preferences", ! &sign->background_descriptor, sign->default_background); roadmap_config_declare ("preferences", ! &sign->foreground_descriptor, sign->default_foreground); } --- 739,752 ---- roadmap_config_declare ("preferences", ! &sign->format_descriptor, sign->default_format, NULL); } roadmap_config_declare ("preferences", ! &sign->background_descriptor, sign->default_background, NULL); roadmap_config_declare ("preferences", ! &sign->foreground_descriptor, sign->default_foreground, NULL); } Index: roadmap_download.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_download.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** roadmap_download.c 24 Nov 2006 11:12:29 -0000 1.13 --- roadmap_download.c 7 Jan 2007 10:01:12 -0000 1.14 *************** *** 446,451 **** const char *directory; - if (!callbacks) callbacks = &RoadMapDownloadCallbackFunctions; - format = RoadMapDownloadFrom; roadmap_config_set (&RoadMapConfigSource, format); --- 446,449 ---- *************** *** 457,462 **** --- 455,462 ---- if (!callbacks) { roadmap_dialog_hide (name); + callbacks = &RoadMapDownloadCallbackFunctions; } + directory = roadmap_path_parent (NULL, destination); roadmap_path_create (directory); *************** *** 1021,1029 **** ("preferences", &RoadMapConfigSource, ! "http://www.freemap.co.il/roadmap/maps/" ROADMAP_FILE_NAME_FORMAT); roadmap_config_declare ("preferences", ! &RoadMapConfigDestination, default_destination); } --- 1021,1030 ---- ("preferences", &RoadMapConfigSource, ! "http://www.freemap.co.il/roadmap/maps/dev1/" ROADMAP_FILE_NAME_FORMAT, ! NULL); roadmap_config_declare ("preferences", ! &RoadMapConfigDestination, default_destination, NULL); } Index: roadgps_screen.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadgps_screen.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadgps_screen.c 17 Jul 2006 06:29:36 -0000 1.6 --- roadgps_screen.c 7 Jan 2007 10:01:12 -0000 1.7 *************** *** 231,235 **** ! static void roadgps_screen_draw (void) { int i; --- 231,235 ---- ! void roadgps_screen_draw (void) { int i; *************** *** 423,429 **** roadmap_config_declare ! ("preferences", &RoadMapConfigGPSBackground, "LightYellow"); roadmap_config_declare ! ("preferences", &RoadMapConfigGPSForeground, "black"); roadmap_gps_register_monitor (roadgps_screen_monitor); --- 423,429 ---- roadmap_config_declare ! ("preferences", &RoadMapConfigGPSBackground, "LightYellow", NULL); roadmap_config_declare ! ("preferences", &RoadMapConfigGPSForeground, "black", NULL); roadmap_gps_register_monitor (roadgps_screen_monitor); Index: roadmap_types.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_types.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_types.h 22 May 2006 09:09:30 -0000 1.3 --- roadmap_types.h 7 Jan 2007 10:01:13 -0000 1.4 *************** *** 59,95 **** #define ROADMAP_ROAD_FREEWAY 1 ! #define ROADMAP_ROAD_RAMP 2 ! #define ROADMAP_ROAD_MAIN 3 ! #define ROADMAP_ROAD_STREET 4 ! #define ROADMAP_ROAD_TRAIL 5 ! #define ROADMAP_ROAD_LAST 5 /* Category: area. */ ! #define ROADMAP_AREA_FIRST 6 ! #define ROADMAP_AREA_PARC 6 ! #define ROADMAP_AREA_HOSPITAL 7 ! #define ROADMAP_AREA_AIRPORT 8 ! #define ROADMAP_AREA_STATION 9 ! #define ROADMAP_AREA_MALL 10 ! #define ROADMAP_AREA_LAST 10 /* Category: water. */ ! #define ROADMAP_WATER_FIRST 11 ! #define ROADMAP_WATER_SHORELINE 11 ! #define ROADMAP_WATER_RIVER 12 ! #define ROADMAP_WATER_LAKE 13 ! #define ROADMAP_WATER_SEA 14 ! #define ROADMAP_WATER_LAST 14 ! #define ROADMAP_CATEGORY_RANGE 14 #endif // INCLUDED__ROADMAP_TYPES__H --- 59,101 ---- #define ROADMAP_ROAD_FREEWAY 1 ! #define ROADMAP_ROAD_PRIMARY 2 ! #define ROADMAP_ROAD_SECONDARY 3 ! #define ROADMAP_ROAD_RAMP 4 ! #define ROADMAP_ROAD_MAIN 5 ! #define ROADMAP_ROAD_EXIT 6 ! #define ROADMAP_ROAD_STREET 7 ! #define ROADMAP_ROAD_PEDESTRIAN 8 ! #define ROADMAP_ROAD_4X4 9 ! #define ROADMAP_ROAD_TRAIL 10 ! #define ROADMAP_ROAD_WALKWAY 11 ! #define ROADMAP_ROAD_LAST 11 /* Category: area. */ ! #define ROADMAP_AREA_FIRST 12 ! #define ROADMAP_AREA_PARC 12 ! #define ROADMAP_AREA_HOSPITAL 13 ! #define ROADMAP_AREA_AIRPORT 14 ! #define ROADMAP_AREA_STATION 15 ! #define ROADMAP_AREA_MALL 16 ! #define ROADMAP_AREA_LAST 16 /* Category: water. */ ! #define ROADMAP_WATER_FIRST 17 ! #define ROADMAP_WATER_SHORELINE 17 ! #define ROADMAP_WATER_RIVER 18 ! #define ROADMAP_WATER_LAKE 19 ! #define ROADMAP_WATER_SEA 20 ! #define ROADMAP_WATER_LAST 20 ! #define ROADMAP_CATEGORY_RANGE 20 #endif // INCLUDED__ROADMAP_TYPES__H Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Makefile 24 Nov 2006 11:11:46 -0000 1.25 --- Makefile 7 Jan 2007 10:01:12 -0000 1.26 *************** *** 174,177 **** --- 174,179 ---- roadmap_factory.c \ roadmap_help.c \ + roadmap_pointer.c \ + roadmap_res.c \ roadgps_screen.c \ roadgps_logger.c Index: roadmap_geocode.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_geocode.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_geocode.c 3 Sep 2006 18:01:31 -0000 1.4 --- roadmap_geocode.c 7 Jan 2007 10:01:12 -0000 1.5 *************** *** 90,94 **** RoadMapGeocodeError = ! roadmap_lang_get ("No related map could not be found"); return 0; } --- 90,94 ---- RoadMapGeocodeError = ! roadmap_lang_get ("No related map could be found"); return 0; } Index: roadgps_logger.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadgps_logger.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadgps_logger.c 15 Oct 2005 22:18:52 -0000 1.1.1.1 --- roadgps_logger.c 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 94,98 **** roadmap_config_declare ! ("session", &RoadMapConfigLogPath, roadmap_path_temporary()); roadmap_gps_register_logger (roadgps_logger); --- 94,98 ---- roadmap_config_declare ! ("session", &RoadMapConfigLogPath, roadmap_path_temporary(), NULL); roadmap_gps_register_logger (roadgps_logger); Index: roadgps_screen.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadgps_screen.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadgps_screen.h 15 Oct 2005 22:19:05 -0000 1.1.1.1 --- roadgps_screen.h 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 26,29 **** --- 26,30 ---- void roadgps_screen_initialize (void); + void roadgps_screen_draw (void); #endif /* INCLUDE__ROADGPS_SCREEN__H */ Index: roadmap_layer.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_layer.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_layer.c 21 Nov 2006 09:23:41 -0000 1.5 --- roadmap_layer.c 7 Jan 2007 10:01:12 -0000 1.6 *************** *** 48,55 **** --- 48,61 ---- static char *RoadMapDefaultCategoryTable[] = { "Freeways", + "Primary", + "Secondary", "Ramps", "Highways", + "Exit", "Streets", + "Pedestrian", + "4X4 Trails", "Trails", + "Walkway", "Parks", "Hospitals", *************** *** 463,467 **** descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, ""); class_name = roadmap_config_get (&descriptor); --- 469,473 ---- descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, "", NULL); class_name = roadmap_config_get (&descriptor); *************** *** 480,485 **** category->thickness.category = name; category->thickness.name = "Thickness"; ! roadmap_config_declare ! ("schema", &category->thickness, "1"); thickness = roadmap_config_get_integer (&category->thickness); --- 486,490 ---- category->thickness.category = name; category->thickness.name = "Thickness"; ! roadmap_config_declare ("schema", &category->thickness, "1", NULL); thickness = roadmap_config_get_integer (&category->thickness); *************** *** 488,492 **** category->declutter.name = "Declutter"; roadmap_config_declare ! ("schema", &category->declutter, "2024800000"); --- 493,497 ---- category->declutter.name = "Declutter"; roadmap_config_declare ! ("schema", &category->declutter, "2024800000", NULL); *************** *** 496,500 **** descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, "black"); color[0] = roadmap_config_get (&descriptor); --- 501,505 ---- descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, "black", NULL); color[0] = roadmap_config_get (&descriptor); *************** *** 503,525 **** for (j = 1; j < ROADMAP_LAYER_PENS; ++j) { snprintf (other_pens, other_pens_length, "Delta%d", j); ! descriptor.name = other_pens; descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, "0"); category->delta_thickness[j] = roadmap_config_get_integer (&descriptor); if (category->delta_thickness[j] == 0) break; snprintf (other_pens, other_pens_length, "Color%d", j); ! descriptor.name = other_pens; descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, ""); color[j] = roadmap_config_get (&descriptor); if (*color[j] == 0) break; --- 508,535 ---- for (j = 1; j < ROADMAP_LAYER_PENS; ++j) { + int is_new; snprintf (other_pens, other_pens_length, "Delta%d", j); ! descriptor.name = strdup(other_pens); descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, "0", &is_new); ! category->delta_thickness[j] = roadmap_config_get_integer (&descriptor); + if (!is_new) free ((void *)descriptor.name); + if (category->delta_thickness[j] == 0) break; snprintf (other_pens, other_pens_length, "Color%d", j); ! descriptor.name = strdup(other_pens); descriptor.reference = NULL; ! roadmap_config_declare ("schema", &descriptor, "", &is_new); color[j] = roadmap_config_get (&descriptor); + if (!is_new) free ((void *)descriptor.name); if (*color[j] == 0) break; Index: roadmap_dictionary.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dictionary.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_dictionary.c 22 May 2006 09:09:30 -0000 1.3 --- roadmap_dictionary.c 7 Jan 2007 10:01:12 -0000 1.4 *************** *** 56,60 **** --- 56,63 ---- struct roadmap_dictionary_tree *tree; + int tree_count; + struct roadmap_dictionary_reference *reference; + int reference_count; unsigned int *string_index; *************** *** 63,66 **** --- 66,72 ---- char *data; int size; + + unsigned short *subtrees; + unsigned short subtrees_count; }; *************** *** 79,82 **** --- 85,94 ---- }; + struct roadmap_dictionary_mask { + int size; + unsigned char relevant[1]; + // The array will have an actual size according to the amount of references + }; + static char *roadmap_dictionary_get_string *************** *** 143,146 **** --- 155,159 ---- static void roadmap_dictionary_walk (struct dictionary_volume *dictionary, int tree_index, + RoadMapDictionaryMask mask, RoadMapDictionaryCB callback, void *data) { *************** *** 153,156 **** --- 166,171 ---- index++) { + if (mask && !mask->relevant[index]) continue; + switch (dictionary->reference[index].type & 0x0f) { *************** *** 167,171 **** roadmap_dictionary_walk ! (dictionary, dictionary->reference[index].index, callback, data); break; --- 182,187 ---- roadmap_dictionary_walk ! (dictionary, dictionary->reference[index].index, ! mask, callback, data); break; *************** *** 285,288 **** --- 301,305 ---- dictionary->tree = (struct roadmap_dictionary_tree *) roadmap_db_get_data (table); + dictionary->tree_count = roadmap_db_get_count (table); table = roadmap_db_get_subsection (child, "node"); *************** *** 290,293 **** --- 307,311 ---- dictionary->reference = (struct roadmap_dictionary_reference *) roadmap_db_get_data (table); + dictionary->reference_count = roadmap_db_get_count (table); table = roadmap_db_get_subsection (child, "index"); *************** *** 296,299 **** --- 314,320 ---- dictionary->string_count = roadmap_db_get_count (table); + dictionary->subtrees = NULL; + dictionary->subtrees_count = 0; + return dictionary; } *************** *** 337,340 **** --- 358,363 ---- struct dictionary_volume *next = this->next; + if (this->subtrees) free (this->subtrees); + free (this); this = next; *************** *** 350,353 **** --- 373,434 ---- + static void roadmap_dictionary_find_words + (struct dictionary_volume *dictionary, int tree_index) { + + int index; + struct roadmap_dictionary_tree *tree = dictionary->tree + tree_index; + + for (index = tree->first; + index < tree->first + tree->count; + index++) { + + switch (dictionary->reference[index].type & 0x0f) { + + case ROADMAP_DICTIONARY_STRING: + break; + + case ROADMAP_DICTIONARY_TREE: + + if (dictionary->reference[index].character == ' ') { + dictionary->subtrees[dictionary->subtrees_count] = tree_index; + dictionary->subtrees_count++; + } + + roadmap_dictionary_find_words + (dictionary, dictionary->reference[index].index); + break; + + default: + roadmap_log (ROADMAP_FATAL, + "corrupted node type %d", + dictionary->reference[index].type & 0x0f); + } + } + } + + + static void roadmap_dictionary_build_substrees + (struct dictionary_volume *dictionary) { + + if (dictionary->subtrees) return; + + dictionary->subtrees = + malloc(sizeof(unsigned short) * dictionary->tree_count); + + roadmap_dictionary_find_words (dictionary, 0); + + if (dictionary->subtrees_count > dictionary->tree_count) { + roadmap_log (ROADMAP_FATAL, + "roadmap_dictionary_build_substrees: too many subtrees!!"); + } + + if (dictionary->subtrees_count < dictionary->tree_count) { + dictionary->subtrees = + realloc(dictionary->subtrees, + sizeof(unsigned short) * dictionary->subtrees_count); + } + } + + RoadMapDictionary roadmap_dictionary_open (char *name) { *************** *** 397,401 **** ! int roadmap_dictionary_move_cursor (RoadMapDictionaryCursor c, char input) { int end; --- 478,483 ---- ! int roadmap_dictionary_move_cursor (RoadMapDictionaryCursor c, char input, ! RoadMapDictionaryMask mask) { int end; *************** *** 423,426 **** --- 505,510 ---- for (index = tree->first; index < end; index++) { + if (mask && !mask->relevant[index]) continue; + if (reference[index].character == input) { *************** *** 535,538 **** --- 619,623 ---- void roadmap_dictionary_get_all_results (RoadMapDictionaryCursor c, + RoadMapDictionaryMask mask, RoadMapDictionaryCB callback, void *data) { *************** *** 545,549 **** } ! roadmap_dictionary_walk (c->volume, c->tree_index, callback, data); return; --- 630,634 ---- } ! roadmap_dictionary_walk (c->volume, c->tree_index, mask, callback, data); return; *************** *** 623,660 **** ! void roadmap_dictionary_search_all ! (RoadMapDictionary dictionary, const char *str, RoadMapDictionaryCB callback, void *data) { struct dictionary_cursor cursor; ! const char *itr = str; cursor.volume = dictionary; - cursor.tree_index = 0; - cursor.complete = 0; - cursor.completion = 0; - cursor.position = 0; ! while (*itr) { ! if (!roadmap_dictionary_move_cursor (&cursor, *itr++)) { ! ! if (cursor.complete) { ! const char *name = roadmap_dictionary_get_string ! (cursor.volume, cursor.completion); ! if (!strncmp (str, name, strlen(str))) { ! RoadMapString string = ! dictionary->reference[cursor.completion].index; ! (*callback) ! (string, roadmap_dictionary_get (dictionary, string), data); ! } } ! return; } } ! roadmap_dictionary_get_all_results (&cursor, callback, data); } --- 708,944 ---- ! int roadmap_dictionary_search_all ! (RoadMapDictionary dictionary, RoadMapDictionaryMask mask, ! const char *str, ! int word_search, RoadMapDictionaryCB callback, void *data) { struct dictionary_cursor cursor; ! const char *itr; ! int subtree_index; ! int subtrees_count = 0; ! int match_count = 0; ! char subtree_str[500]; cursor.volume = dictionary; ! if (word_search) { ! if (!dictionary->subtrees) { ! roadmap_dictionary_build_substrees (dictionary); ! } ! subtrees_count = dictionary->subtrees_count; ! subtree_str[0] = ' '; ! strncpy(subtree_str + 1, str, sizeof(subtree_str) - 2); ! subtree_str[sizeof(subtree_str)-1] = '\0'; ! } ! for (subtree_index = -1; subtree_index < subtrees_count; subtree_index++) { ! int status; ! ! itr = str; ! if (subtree_index == -1) { ! cursor.tree_index = 0; ! cursor.position = 0; ! } else { ! cursor.tree_index = dictionary->subtrees[subtree_index]; ! cursor.position = (dictionary->tree + cursor.tree_index)->position; ! } ! ! cursor.complete = 0; ! cursor.completion = 0; ! ! if (subtree_index != -1) { ! // A subtree search always starts with a space ! status = roadmap_dictionary_move_cursor (&cursor, ' ', mask); ! } else { ! status = 1; ! } ! ! while (*itr && status) { ! status = roadmap_dictionary_move_cursor (&cursor, *itr++, mask); ! } ! ! if (!status && !cursor.complete) continue; // Search the next sub tree ! ! if (cursor.complete) { ! const char *name; ! ! name = roadmap_dictionary_get_string ! (cursor.volume, cursor.completion); ! ! if (((subtree_index == -1) && !strncmp (str, name, strlen(str))) || ! ((subtree_index != -1) && strstr (name, subtree_str))) { ! RoadMapString string; ! ! match_count += 1; ! ! if (!callback) continue; ! ! string = dictionary->reference[cursor.completion].index; ! (*callback) ! (string, roadmap_dictionary_get (dictionary, string), data); ! } ! ! continue; ! } ! ! if (subtree_index != -1) { ! /* Make sure that this path really leads to strings which match */ ! struct roadmap_dictionary_tree *tree = ! dictionary->tree + cursor.tree_index; ! RoadMapString string; ! ! while ((dictionary->reference[tree->first].type & 0x0f) == ! ROADMAP_DICTIONARY_TREE) { ! tree = dictionary->tree + dictionary->reference[tree->first].index; ! } ! ! if ((dictionary->reference[tree->first].type & 0x0f) != ! ROADMAP_DICTIONARY_STRING) { ! ! roadmap_log (ROADMAP_FATAL, ! "corrupted node type %d", ! dictionary->reference[tree->first].type & 0x0f); ! } ! ! string = dictionary->reference[tree->first].index; ! ! if (!strstr(roadmap_dictionary_get (dictionary, string), ! subtree_str)) { ! continue; } ! } ! ! if (callback) { ! roadmap_dictionary_get_all_results (&cursor, mask, callback, data); ! } ! ! if (mask) { ! int index; ! int count = 0; ! struct roadmap_dictionary_tree *tree = ! cursor.volume->tree + cursor.tree_index; ! ! for (index = tree->first; ! index < tree->first + tree->count; ! index++) { ! ! count += mask->relevant[index]; ! } ! ! match_count += count; ! ! } else { ! match_count += (cursor.volume->tree + cursor.tree_index)->num_strings; } } ! return match_count; ! } ! ! ! RoadMapDictionaryMask roadmap_dictionary_mask_new (RoadMapDictionary dictionary) { ! RoadMapDictionaryMask mask = ! (RoadMapDictionaryMask) ! calloc(sizeof(struct roadmap_dictionary_mask) + sizeof(unsigned char) * dictionary->reference_count, 1); ! ! mask->size = dictionary->reference_count; ! ! return mask; ! } ! ! ! void roadmap_dictionary_mask_free (RoadMapDictionaryMask mask) { ! ! free (mask); ! } ! ! ! static int ! roadmap_dictionary_set_mask (struct dictionary_volume *dictionary, ! struct roadmap_dictionary_tree *tree, ! const char *string, ! int length, ! RoadMapDictionaryMask mask, ! int *pos) { ! ! int index; ! char character; ! char *stored; ! ! while (tree->position > *pos) (*pos)++; ! ! if (*pos > length) return 0; ! ! character = string[*pos]; ! ! index = roadmap_dictionary_get_reference (dictionary, tree, character); ! ! if (index < 0) { ! return 0; ! } ! ! switch (dictionary->reference[index].type) { ! ! case ROADMAP_DICTIONARY_STRING: ! ! stored = roadmap_dictionary_get_string (dictionary, index); ! ! if ((stored[length] != 0) || ! (strncasecmp (string, stored, length) != 0)) { ! return 0; ! } ! ! if (index >= mask->size) { ! roadmap_log (ROADMAP_FATAL, ! "roadmap_dictionary_set_mask: invalid index %d", index); ! } ! // Check if this string is already set ! if (mask->relevant[index]) return 0; ! ! mask->relevant[index] = 1; ! return 1; ! ! case ROADMAP_DICTIONARY_TREE: ! ! tree = dictionary->tree + dictionary->reference[index].index; ! (*pos)++; ! if (roadmap_dictionary_set_mask ! (dictionary, tree, string, length, mask, pos)) { ! ! if (index >= mask->size) { ! roadmap_log (ROADMAP_FATAL, ! "roadmap_dictionary_set_mask: invalid index %d", index); ! } ! if (mask->relevant[index] < 255) mask->relevant[index]++; ! return 1; ! } ! break; ! ! default: ! roadmap_log (ROADMAP_FATAL, ! "corrupted node when searching for %s", string); ! } ! ! return 0; } + void roadmap_dictionary_mask_set (RoadMapDictionary d, + RoadMapString index, + RoadMapDictionaryMask mask) { + + const char *str; + int pos = 0; + + if (index >= d->string_count) { + roadmap_log (ROADMAP_FATAL, + "roadmap_dictionary_mask_set: invalid index %d", index); + return; + } + + str = d->data + d->string_index[index]; + roadmap_dictionary_set_mask (d, d->tree, str, strlen(str), mask, &pos); + } + Index: roadgps_start.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadgps_start.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadgps_start.c 15 Oct 2005 22:18:53 -0000 1.1.1.1 --- roadgps_start.c 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 38,41 **** --- 38,45 ---- #include "roadmap_gps.h" #include "roadmap_factory.h" + #include "roadmap_pointer.h" + #include "roadmap_sound.h" + #include "roadmap_lang.h" + #include "roadmap_res.h" #include "roadmap_math.h" #include "roadmap_main.h" *************** *** 52,55 **** --- 56,61 ---- ROADMAP_CONFIG_ITEM("General", "Toolbar"); + static RoadMapStartSubscriber RoadMapStartSubscribers = NULL; + /* The RoadGps menu and toolbar items: ----------------------------------- */ *************** *** 209,212 **** --- 215,219 ---- roadmap_config_save (0); + roadmap_res_shutdown (); } *************** *** 222,225 **** --- 229,235 ---- ("preferences", &RoadMapConfigGeneralToolbar, "yes", "no", NULL); + roadmap_pointer_initialize (); + roadmap_lang_initialize (); + roadmap_sound_initialize (); roadmap_gps_initialize (); roadgps_screen_initialize (); *************** *** 236,240 **** --- 246,269 ---- roadgps_start_window (); + if (RoadMapStartSubscribers) RoadMapStartSubscribers (ROADMAP_START_INIT); + roadmap_gps_open (); } + + RoadMapStartSubscriber roadmap_start_subscribe + (RoadMapStartSubscriber handler) { + + RoadMapStartSubscriber previous = RoadMapStartSubscribers; + + RoadMapStartSubscribers = handler; + + return previous; + } + + + void roadmap_start_redraw (void) { + roadgps_screen_draw (); + } + + void roadmap_start_screen_refresh (int refresh) {} Index: roadmap_dictionary.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_dictionary.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_dictionary.h 12 May 2006 13:16:43 -0000 1.2 --- roadmap_dictionary.h 7 Jan 2007 10:01:12 -0000 1.3 *************** *** 29,32 **** --- 29,33 ---- typedef struct dictionary_volume *RoadMapDictionary; + typedef struct roadmap_dictionary_mask *RoadMapDictionaryMask; typedef int (*RoadMapDictionaryCB) (RoadMapString index, const char *string, void *data); *************** *** 41,45 **** RoadMapDictionaryCursor roadmap_dictionary_new_cursor (RoadMapDictionary d); ! int roadmap_dictionary_move_cursor (RoadMapDictionaryCursor c, char input); int roadmap_dictionary_completable (RoadMapDictionaryCursor c); void roadmap_dictionary_completion (RoadMapDictionaryCursor c, char *data); --- 42,47 ---- RoadMapDictionaryCursor roadmap_dictionary_new_cursor (RoadMapDictionary d); ! int roadmap_dictionary_move_cursor (RoadMapDictionaryCursor c, char input, ! RoadMapDictionaryMask mask); int roadmap_dictionary_completable (RoadMapDictionaryCursor c); void roadmap_dictionary_completion (RoadMapDictionaryCursor c, char *data); *************** *** 47,56 **** int roadmap_dictionary_get_result (RoadMapDictionaryCursor c); void roadmap_dictionary_get_all_results (RoadMapDictionaryCursor c, RoadMapDictionaryCB callback, void *data); void roadmap_dictionary_free_cursor (RoadMapDictionaryCursor c); ! void roadmap_dictionary_search_all ! (RoadMapDictionary dictionary, const char *str, RoadMapDictionaryCB callback, void *data); --- 49,61 ---- int roadmap_dictionary_get_result (RoadMapDictionaryCursor c); void roadmap_dictionary_get_all_results (RoadMapDictionaryCursor c, + RoadMapDictionaryMask mask, RoadMapDictionaryCB callback, void *data); void roadmap_dictionary_free_cursor (RoadMapDictionaryCursor c); ! int roadmap_dictionary_search_all ! (RoadMapDictionary dictionary, RoadMapDictionaryMask mask, ! const char *str, ! int word_search, RoadMapDictionaryCB callback, void *data); *************** *** 61,64 **** --- 66,76 ---- void roadmap_dictionary_dump_volume (char *name); + RoadMapDictionaryMask roadmap_dictionary_mask_new + (RoadMapDictionary dictionary); + void roadmap_dictionary_mask_free (RoadMapDictionaryMask mask); + void roadmap_dictionary_mask_set (RoadMapDictionary d, + RoadMapString index, + RoadMapDictionaryMask mask); + extern roadmap_db_handler RoadMapDictionaryHandler; Index: roadmap_address.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_address.h 18 Aug 2006 17:19:07 -0000 1.3 --- roadmap_address.h 7 Jan 2007 10:01:12 -0000 1.4 *************** *** 41,43 **** --- 41,47 ---- void roadmap_address_register_nav (RoadMapAddressNav navigate); + #ifdef SSD + void roadmap_address_history (void); + #endif + #endif // INCLUDE__ROADMAP_ADDRESS__H Index: roadmap_voice.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_voice.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_voice.c 11 Jun 2006 11:41:40 -0000 1.5 --- roadmap_voice.c 7 Jan 2007 10:01:13 -0000 1.6 *************** *** 365,369 **** roadmap_config_declare ("preferences", ! &RoadMapVoiceText[i].config, RoadMapVoiceText[i].default_text); } } --- 365,370 ---- roadmap_config_declare ("preferences", ! &RoadMapVoiceText[i].config, RoadMapVoiceText[i].default_text, ! NULL); } } Index: roadmap_math.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_math.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** roadmap_math.c 17 Nov 2006 16:54:42 -0000 1.11 --- roadmap_math.c 7 Jan 2007 10:01:12 -0000 1.12 *************** *** 518,524 **** /* make the Y coordinate converge on the horizon as the * distance from the center goes to infinity */ ! point->y = RoadMapContext.height - (DistFromCenterY * VisibleRange) / ! (abs(DistFromCenterY) + VisibleRange) ; /* X distance from center of the screen */ --- 518,524 ---- /* make the Y coordinate converge on the horizon as the * distance from the center goes to infinity */ ! point->y = (short) (RoadMapContext.height - (DistFromCenterY * VisibleRange) / ! (abs(DistFromCenterY) + VisibleRange)); /* X distance from center of the screen */ *************** *** 564,568 **** /* center on screen */ ! point2.y = RoadMapContext.height - D; *point = point2; --- 564,568 ---- /* center on screen */ ! point2.y = (short) (RoadMapContext.height - D); *point = point2; *************** *** 704,710 **** void roadmap_math_initialize (void) { ! roadmap_config_declare ("session", &RoadMapConfigGeneralZoom, "0"); roadmap_config_declare ! ("preferences", &RoadMapConfigGeneralDefaultZoom, "20"); roadmap_state_add ("zoom_reset", &roadmap_math_zoom_state); --- 704,710 ---- void roadmap_math_initialize (void) { ! roadmap_config_declare ("session", &RoadMapConfigGeneralZoom, "0", NULL); roadmap_config_declare ! ("preferences", &RoadMapConfigGeneralDefaultZoom, "20", NULL); roadmap_state_add ("zoom_reset", &roadmap_math_zoom_state); *************** *** 1645,1649 **** isect->y = (b2 + x * a2) / 1024; } ! isect->x = x; #endif --- 1645,1649 ---- isect->y = (b2 + x * a2) / 1024; } ! isect->x = (short)x; #endif Index: roadmap_driver.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_driver.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap_driver.c 14 Oct 2006 09:04:08 -0000 1.3 --- roadmap_driver.c 7 Jan 2007 10:01:12 -0000 1.4 *************** *** 413,417 **** roadmap_config_declare ("preferences", &descriptor, ! roadmap_string_get(fields->pxrmcfg.value)); value = roadmap_config_get (&descriptor); --- 413,417 ---- roadmap_config_declare ("preferences", &descriptor, ! roadmap_string_get(fields->pxrmcfg.value), NULL); value = roadmap_config_get (&descriptor); *************** *** 728,732 **** roadmap_config_declare ! ("preferences", &RoadMapDriverConfigPort, "2007"); --- 728,732 ---- roadmap_config_declare ! ("preferences", &RoadMapDriverConfigPort, "2007", NULL); Index: roadmap_history.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_history.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** roadmap_history.c 15 Oct 2005 22:18:52 -0000 1.1.1.1 --- roadmap_history.c 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 190,194 **** void roadmap_history_initialize (void) { ! roadmap_config_declare ("preferences", &RoadMapConfigHistoryDepth, "100"); } --- 190,195 ---- void roadmap_history_initialize (void) { ! roadmap_config_declare ! ("preferences", &RoadMapConfigHistoryDepth, "100", NULL); } Index: roadmap_address_ssd.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_address_ssd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_address_ssd.c 21 Nov 2006 09:17:41 -0000 1.1 --- roadmap_address_ssd.c 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 116,123 **** ! static void roadmap_address_show (const char *city, ! const char *street_name, ! const char *street_number_image, ! RoadMapAddressDialog *context) { int i; --- 116,123 ---- ! static int roadmap_address_show (const char *city, ! const char *street_name, ! const char *street_number_image, ! RoadMapAddressDialog *context) { int i; *************** *** 132,136 **** if (context->use_zip) { ! return; /* TBD: how to select by ZIP ? Need one more table in usdir. */ } --- 132,136 ---- if (context->use_zip) { ! return 0; /* TBD: how to select by ZIP ? Need one more table in usdir. */ } *************** *** 144,148 **** roadmap_geocode_last_error()); free (selections); ! return; } --- 144,148 ---- roadmap_geocode_last_error()); free (selections); ! return 0; } *************** *** 152,156 **** argv[3] = state; ! //roadmap_history_add ('A', argv); roadmap_address_done (selections, context); --- 152,156 ---- argv[3] = state; ! roadmap_history_add ('A', argv); roadmap_address_done (selections, context); *************** *** 162,165 **** --- 162,167 ---- free (selections); + + return 1; } *************** *** 178,197 **** static void roadmap_address_search_populate (const char *str, ! RoadMapAddressSearch *search, ! int force) { RoadMapAddressSearchCount = 0; ! if (force || strlen(str)) { ! ! if (search->city) { ! roadmap_street_search (search->city, ! str, ! roadmap_address_populate_list, ! NULL); ! } else { ! roadmap_locator_search_city (str, roadmap_address_populate_list, NULL); ! } } } --- 180,210 ---- + static int roadmap_address_search_count (const char *str, + RoadMapAddressSearch *search) { + + int count; + + if (search->city) { + count = roadmap_street_search (search->city, str, NULL, NULL); + } else { + count = roadmap_locator_search_city (str, NULL, NULL); + } + + return count; + } + + static void roadmap_address_search_populate (const char *str, ! RoadMapAddressSearch *search) { RoadMapAddressSearchCount = 0; ! if (search->city) { ! roadmap_street_search (search->city, ! str, ! roadmap_address_populate_list, ! NULL); ! } else { ! roadmap_locator_search_city (str, roadmap_address_populate_list, NULL); } } *************** *** 202,219 **** RoadMapAddressSearch *search = (RoadMapAddressSearch *)context; ! ssd_keyboard_hide (SSD_KEYBOARD_LETTERS); ! ssd_list_hide (); search->callback (new_value, search->data); free (search); return 1; } static int keyboard_callback (int type, const char *new_value, void *context) { RoadMapAddressSearch *search = (RoadMapAddressSearch *)context; const char *title; if (!search->city) { --- 215,253 ---- RoadMapAddressSearch *search = (RoadMapAddressSearch *)context; ! if ((strlen(new_value) > 3) && ! !strcmp(new_value + strlen(new_value) - 3, " - ")) { ! ! char str[255]; ! ! ssd_list_hide (); ! ! strcpy(str, new_value); ! str[strlen(str) - 2] = '\0'; ! ! ssd_dialog_set_value ("input", str); ! ! return 1; ! } ! ! ssd_keyboard_hide (); search->callback (new_value, search->data); free (search); + ssd_list_hide (); + return 1; } + static int cmpstring(const void *p1, const void *p2) { + return strcmp(* (char * const *) p1, * (char * const *) p2); + } + static int keyboard_callback (int type, const char *new_value, void *context) { RoadMapAddressSearch *search = (RoadMapAddressSearch *)context; const char *title; + int count; if (!search->city) { *************** *** 223,235 **** } ! roadmap_address_search_populate (new_value, search, ! type == SSD_KEYBOARD_OK); ! if (*new_value && !RoadMapAddressSearchCount) return 0; ! if (!RoadMapAddressSearchCount) return 1; ! if ((RoadMapAddressSearchCount <= MAX_LIST_RESULTS) || (type == SSD_KEYBOARD_OK)) { ssd_list_show (title, RoadMapAddressSearchCount, --- 257,273 ---- } ! count = roadmap_address_search_count (new_value, search); ! if (*new_value && !count) return 0; ! if (!count) return 1; ! if ((count <= MAX_LIST_RESULTS) || (type == SSD_KEYBOARD_OK)) { + roadmap_address_search_populate (new_value, search); + + qsort (RoadMapAddressSearchNames, RoadMapAddressSearchCount, + sizeof(RoadMapAddressSearchNames[0]), cmpstring); + ssd_list_show (title, RoadMapAddressSearchCount, *************** *** 245,248 **** --- 283,311 ---- + static int house_keyboard_callback (int type, const char *new_value, + void *data) { + + RoadMapAddressDialog *context = (RoadMapAddressDialog *)data; + + if (type == SSD_KEYBOARD_EXTRA) { + context->navigate = 1; + if (roadmap_address_show (context->city_name, context->street_name, + new_value, context)) { + ssd_keyboard_hide (); + } + context->navigate = 0; + } + + if (type == SSD_KEYBOARD_OK) { + if (roadmap_address_show (context->city_name, context->street_name, + new_value, context)) { + ssd_keyboard_hide (); + } + } + + return 1; + } + + static void roadmap_address_street_result (const char *result, void *data) { *************** *** 262,266 **** tmp += 2; ! roadmap_address_show (tmp, name, "", context); } --- 325,337 ---- tmp += 2; ! if (context->street_name) free(context->street_name); ! context->street_name = strdup(name); ! ! ssd_keyboard_show (SSD_KEYBOARD_DIGITS, ! roadmap_lang_get ("House number"), ! "", ! roadmap_lang_get ("Navigate"), ! house_keyboard_callback, ! context); } *************** *** 269,272 **** --- 340,344 ---- RoadMapAddressDialog *context = (RoadMapAddressDialog *)data; + if (context->city_name) free(context->city_name); context->city_name = strdup(result); *************** *** 283,286 **** --- 355,398 ---- + static int history_callback (int type, const char *new_value, void *data) { + RoadMapAddressDialog *context = (RoadMapAddressDialog *)data; + + if (!new_value[0] || !strcmp(new_value, roadmap_lang_get ("New address"))) { + roadmap_address_search_dialog + (NULL, roadmap_address_city_result, data); + + } else if (!strchr(new_value, ',')) { + /* We only got a city */ + if (context->city_name) free(context->city_name); + context->city_name = strdup (new_value); + roadmap_address_search_dialog + (context->city_name, roadmap_address_street_result, data); + } else { + /* We got a full address */ + char *argv[4]; + + roadmap_history_get ('A', (void *) ssd_dialog_get_data ("list"), argv); + + context->navigate = 1; + if (context->city_name) free(context->city_name); + if (context->street_name) free(context->street_name); + context->city_name = strdup (argv[2]); + context->street_name = strdup (argv[1]); + + if (roadmap_address_show (context->city_name, context->street_name, + argv[0], context)) { + ssd_list_hide (); + } + context->navigate = 0; + + return 1; + } + + ssd_list_hide (); + + return 1; + } + + void roadmap_address_search_dialog (const char *city, RoadMapAddressSearchCB callback, *************** *** 304,331 **** title, "", keyboard_callback, context); - #if 0 - if (roadmap_dialog_activate ("Search Address", context)) { ! roadmap_dialog_new_entry (".search", "Name", ! roadmap_address_search_populate); ! roadmap_dialog_new_label (".search", "found"); ! ! roadmap_dialog_new_list (".search", ".results"); ! roadmap_dialog_add_button ("Cancel", roadmap_address_search_cancel); ! roadmap_dialog_add_button ("Done", roadmap_address_search_done); ! roadmap_dialog_complete (roadmap_preferences_use_keyboard()); /* No need for a keyboard. */ } ! roadmap_dialog_set_data (".search", "Name", ""); ! roadmap_dialog_set_data (".search", "found", ""); ! roadmap_dialog_set_focus (".search", "Name"); ! roadmap_address_search_populate ("Search Address", context); ! #endif } --- 416,477 ---- title, "", + NULL, keyboard_callback, context); + } ! void roadmap_address_history (void) { ! #define MAX_HISTORY_ENTRIES 100 ! static char *labels[MAX_HISTORY_ENTRIES]; ! static char *values[MAX_HISTORY_ENTRIES]; ! static int count = -1; ! void *history; ! static RoadMapAddressDialog context = {"Location", 0, 0, NULL, NULL, ! NULL, NULL, 0}; ! if (count == -1) { ! roadmap_history_declare ('A', 4); ! labels[0] = (char *)roadmap_lang_get ("New address"); } ! history = roadmap_history_latest ('A'); ! count = 1; ! ! while (history && (count < MAX_HISTORY_ENTRIES)) { ! void *prev = history; ! ! char *argv[4]; ! char str[100]; ! ! roadmap_history_get ('A', history, argv); ! ! if (count == 1) { ! /* Add special city entry */ ! if (labels[1]) free (labels[1]); ! labels[1] = strdup (argv[2]); ! count++; ! } ! ! snprintf (str, sizeof(str), "%s %s, %s", argv[1], argv[0], argv[2]); ! ! if (labels[count]) free (labels[count]); ! labels[count] = strdup(str); ! ! values[count] = history; ! ! count++; ! history = roadmap_history_before ('A', history); ! if (history == prev) break; ! } ! ! ssd_list_show (roadmap_lang_get ("History"), ! count, ! (const char **)labels, ! (const void **)values, ! history_callback, ! &context); } Index: roadmap_config.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_config.h 21 Nov 2006 09:22:08 -0000 1.5 --- roadmap_config.h 7 Jan 2007 10:01:12 -0000 1.6 *************** *** 57,61 **** void roadmap_config_declare (const char *file, ! RoadMapConfigDescriptor *descriptor, const char *default_value); void roadmap_config_declare_password --- 57,62 ---- void roadmap_config_declare (const char *file, ! RoadMapConfigDescriptor *descriptor, const char *default_value, ! int *is_new); void roadmap_config_declare_password Index: dumpmap_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/dumpmap_main.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** dumpmap_main.c 15 Oct 2005 22:18:52 -0000 1.1.1.1 --- dumpmap_main.c 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 193,197 **** } while (strchr (choices, input) == NULL); ! roadmap_dictionary_move_cursor (cursor, input); roadmap_dictionary_get_next (cursor, choices); } --- 193,197 ---- } while (strchr (choices, input) == NULL); ! roadmap_dictionary_move_cursor (cursor, input, NULL); roadmap_dictionary_get_next (cursor, choices); } Index: roadmap_config.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roadmap_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_config.c 24 Nov 2006 11:10:36 -0000 1.7 --- roadmap_config.c 7 Jan 2007 10:01:12 -0000 1.8 *************** *** 139,144 **** } ! if ((descriptor->age != RoadMapConfigAge) || ! (descriptor->reference == NULL)) { descriptor->reference = NULL; --- 139,144 ---- } ! if ((descriptor->reference == NULL) || ! (descriptor->age != RoadMapConfigAge)) { descriptor->reference = NULL; *************** *** 163,167 **** RoadMapConfigDescriptor *descriptor, const char *default_value, ! unsigned char item_type) { RoadMapConfigItem *new_item; --- 163,168 ---- RoadMapConfigDescriptor *descriptor, const char *default_value, ! unsigned char item_type, ! int *is_new) { RoadMapConfigItem *new_item; *************** *** 190,193 **** --- 191,196 ---- } + if (is_new) *is_new = 0; + } else { *************** *** 218,221 **** --- 221,226 ---- } file->first_item = new_item; + + if (is_new) *is_new = 1; } *************** *** 254,263 **** void roadmap_config_declare (const char *config, RoadMapConfigDescriptor *descriptor, ! const char *default_value) { RoadMapConfig *file = roadmap_config_search_file (config); roadmap_config_new_item ! (file, descriptor, default_value, ROADMAP_CONFIG_STRING); } --- 259,268 ---- void roadmap_config_declare (const char *config, RoadMapConfigDescriptor *descriptor, ! const char *default_value, int *is_new) { RoadMapConfig *file = roadmap_config_search_file (config); roadmap_config_new_item ! (file, descriptor, default_value, ROADMAP_CONFIG_STRING, is_new); } *************** *** 270,274 **** roadmap_config_new_item ! (file, descriptor, default_value, ROADMAP_CONFIG_PASSWORD); } --- 275,279 ---- roadmap_config_new_item ! (file, descriptor, default_value, ROADMAP_CONFIG_PASSWORD, NULL); } *************** *** 287,291 **** item = roadmap_config_new_item ! (file, descriptor, enumeration_value, ROADMAP_CONFIG_ENUM); /* Replace the enumeration list. */ --- 292,296 ---- item = roadmap_config_new_item ! (file, descriptor, enumeration_value, ROADMAP_CONFIG_ENUM, NULL); /* Replace the enumeration list. */ *************** *** 319,323 **** roadmap_config_new_item ! (file, descriptor, default_value, ROADMAP_CONFIG_COLOR); } --- 324,328 ---- roadmap_config_new_item ! (file, descriptor, default_value, ROADMAP_CONFIG_COLOR, NULL); } *************** *** 465,468 **** --- 470,474 ---- while (!feof(file)) { + int new_item; /* Read the next line, skip empty lines and comments. */ *************** *** 505,509 **** item = roadmap_config_new_item ! (config, &descriptor, "", ROADMAP_CONFIG_STRING); if (item->value != NULL) { free(item->value); --- 511,520 ---- item = roadmap_config_new_item ! (config, &descriptor, "", ROADMAP_CONFIG_STRING, &new_item); ! if (!new_item) { ! free ((void *)descriptor.name); ! free ((void *)descriptor.category); ! } ! if (item->value != NULL) { free(item->value); Index: quick.menu =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/quick.menu,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quick.menu 3 Sep 2006 17:57:27 -0000 1.1 --- quick.menu 7 Jan 2007 10:01:12 -0000 1.2 *************** *** 7,10 **** --- 7,11 ---- - detectreceiver + traffic preferences about Index: roadmap_factory.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/roa... [truncated message content] |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:55:05
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745 Modified Files: Makefile authors copying roadmap_canvas.cpp Log Message: Update to agg 2.5 Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 12 May 2006 13:29:29 -0000 1.1 --- Makefile 7 Jan 2007 09:54:26 -0000 1.2 *************** *** 1,703 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. ! # Makefile. Generated from Makefile.in by configure. ! ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. ! # This Makefile.in is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. ! ! ! ! srcdir = . ! top_srcdir = . ! ! pkgdatadir = $(datadir)/agg ! pkglibdir = $(libdir)/agg ! pkgincludedir = $(includedir)/agg ! top_builddir = . ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /usr/bin/install -c ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) ! NORMAL_INSTALL = : ! PRE_INSTALL = : ! POST_INSTALL = : ! NORMAL_UNINSTALL = : ! PRE_UNINSTALL = : ! POST_UNINSTALL = : ! build_triplet = i686-pc-linux-gnu ! host_triplet = i686-pc-linux-gnu ! target_triplet = i686-pc-linux-gnu ! DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ ! $(srcdir)/Makefile.in $(srcdir)/libagg.pc.in \ ! $(top_srcdir)/configure ChangeLog config.guess config.sub \ ! install-sh ltmain.sh missing ! subdir = . ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ! configure.lineno configure.status.lineno ! mkinstalldirs = $(install_sh) -d ! CONFIG_HEADER = $(top_builddir)/include/config.h ! CONFIG_CLEAN_FILES = libagg.pc ! depcomp = ! am__depfiles_maybe = ! SOURCES = ! DIST_SOURCES = ! RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ! html-recursive info-recursive install-data-recursive \ ! install-exec-recursive install-info-recursive \ ! install-recursive installcheck-recursive installdirs-recursive \ ! pdf-recursive ps-recursive uninstall-info-recursive \ ! uninstall-recursive ! am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ! am__vpath_adj = case $$p in \ ! $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ! *) f=$$p;; \ ! esac; ! am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ! am__installdirs = "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" ! m4dataDATA_INSTALL = $(INSTALL_DATA) ! pkgconfigDATA_INSTALL = $(INSTALL_DATA) ! DATA = $(m4data_DATA) $(pkgconfig_DATA) ! ETAGS = etags ! CTAGS = ctags ! DIST_SUBDIRS = $(SUBDIRS) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! distdir = $(PACKAGE)-$(VERSION) ! top_distdir = $(distdir) ! am__remove_distdir = \ ! { test ! -d $(distdir) \ ! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ! && rm -fr $(distdir); }; } ! DIST_ARCHIVES = $(distdir).tar.gz ! GZIP_ENV = --best ! distuninstallcheck_listfiles = find . -type f -print ! distcleancheck_listfiles = find . -type f -print ! ACLOCAL = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run aclocal-1.9 ! AGG_LIB_VERSION = 2:4:0 ! AMDEP_FALSE = # ! AMDEP_TRUE = ! AMTAR = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run tar ! AR = ar ! AUTOCONF = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run autoconf ! AUTOHEADER = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run autoheader ! AUTOMAKE = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run automake-1.9 ! AWK = gawk ! CC = gcc ! CCDEPMODE = depmode=none ! CFLAGS = -g -O2 ! CPP = gcc -E ! CPPFLAGS = ! CXX = g++ ! CXXCPP = g++ -E ! CXXDEPMODE = depmode=none ! CXXFLAGS = -g -O2 ! CYGPATH_W = echo ! DEFS = -DHAVE_CONFIG_H ! DEPDIR = .deps ! ECHO = echo ! ECHO_C = ! ECHO_N = -n ! ECHO_T = ! EGREP = grep -E ! ENABLE_CTRL_FALSE = # ! ENABLE_CTRL_TRUE = ! ENABLE_EXAMPLES_FALSE = # ! ENABLE_EXAMPLES_TRUE = ! ENABLE_FT_FALSE = # ! ENABLE_FT_TRUE = ! ENABLE_GPC_FALSE = ! ENABLE_GPC_TRUE = # ! ENABLE_OSX_FALSE = ! ENABLE_OSX_TRUE = # ! ENABLE_SDL_FALSE = # ! ENABLE_SDL_TRUE = ! ENABLE_WIN32_FALSE = ! ENABLE_WIN32_TRUE = # ! ENABLE_WIN32_TT_FALSE = ! ENABLE_WIN32_TT_TRUE = # ! ENABLE_X11_FALSE = # ! ENABLE_X11_TRUE = ! EXEEXT = ! F77 = g77 ! FFLAGS = -g -O2 ! FREETYPE_CFLAGS = -I/usr/include/freetype2 ! FREETYPE_LIBS = -lfreetype -lz ! INSTALL_DATA = ${INSTALL} -m 644 ! INSTALL_PROGRAM = ${INSTALL} ! INSTALL_SCRIPT = ${INSTALL} ! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! LDFLAGS = ! LIBOBJS = ! LIBS = ! LIBTOOL = $(SHELL) $(top_builddir)/libtool ! LN_S = ln -s ! LTLIBOBJS = ! MAKEINFO = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run makeinfo ! OBJEXT = o ! OSX_CFLAGS = ! OSX_LIBS = ! PACKAGE = agg ! PACKAGE_BUGREPORT = ! PACKAGE_NAME = ! PACKAGE_STRING = ! PACKAGE_TARNAME = ! PACKAGE_VERSION = ! PATH_SEPARATOR = : ! PKG_CONFIG = /usr/bin/pkg-config ! PREFERED_PLATFORM = X11 ! RANLIB = ranlib ! SDL_CFLAGS = -I/usr/include/SDL -D_REENTRANT ! SDL_CONFIG = /usr/bin/sdl-config ! SDL_LIBS = -lSDL -lpthread ! SET_MAKE = ! SHELL = /bin/sh ! STRIP = strip ! U = ! VERSION = 2.4.0 ! WINDOWS_CFLAGS = ! WINDOWS_LIBS = ! ac_ct_AR = ar ! ac_ct_CC = gcc ! ac_ct_CXX = g++ ! ac_ct_F77 = g77 ! ac_ct_RANLIB = ranlib ! ac_ct_STRIP = strip ! ac_pt_PKG_CONFIG = /usr/bin/pkg-config ! am__fastdepCC_FALSE = ! am__fastdepCC_TRUE = # ! am__fastdepCXX_FALSE = ! am__fastdepCXX_TRUE = # ! am__include = include ! am__leading_dot = . ! am__quote = ! am__tar = ${AMTAR} chof - "$$tardir" ! am__untar = ${AMTAR} xf - ! bindir = ${exec_prefix}/bin ! build = i686-pc-linux-gnu ! build_alias = ! build_cpu = i686 ! build_os = linux-gnu ! build_vendor = pc ! datadir = ${prefix}/share ! exec_prefix = ${prefix} ! host = i686-pc-linux-gnu ! host_alias = ! host_cpu = i686 ! host_os = linux-gnu ! host_vendor = pc ! includedir = ${prefix}/include ! infodir = ${prefix}/info ! install_sh = /home/ehud/Projects/agg-2.4/install-sh ! libdir = ${exec_prefix}/lib ! libexecdir = ${exec_prefix}/libexec ! localstatedir = ${prefix}/var ! mandir = ${prefix}/man ! mkdir_p = mkdir -p -- ! oldincludedir = /usr/include ! prefix = /usr/local ! program_transform_name = s,x,x, ! sbindir = ${exec_prefix}/sbin ! sharedstatedir = ${prefix}/com ! sysconfdir = ${prefix}/etc ! target = i686-pc-linux-gnu ! target_alias = ! target_cpu = i686 ! target_os = linux-gnu ! target_vendor = pc ! x_includes = ! x_libraries = ! SUBDIRS = gpc src font_freetype font_win32_tt include examples ! pkgconfigdir = $(libdir)/pkgconfig ! pkgconfig_DATA = libagg.pc ! EXTRA_DIST = Makefile.AmigaOS \ ! Makefile.in.BeOS \ ! Makefile.in.CYGWIN_NT-5.0 \ ! Makefile.in.CYGWIN_NT-5.1 \ ! Makefile.in.Darwin \ ! Makefile.in.Darwin.SDL \ ! Makefile.in.IRIX64 \ ! Makefile.in.Linux \ ! Makefile.in.Linux.SDL \ ! Makefile.in.MINGW32_NT-5.0 \ ! Makefile.in.MINGW32_NT-5.1 \ ! Makefile.in.SunOS ! ! ! # M4 macro file for inclusion with autoconf ! m4datadir = $(datadir)/aclocal ! m4data_DATA = libagg.m4 ! all: all-recursive ! ! .SUFFIXES: ! am--refresh: ! @: ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! echo ' cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps'; \ ! cd $(srcdir) && $(AUTOMAKE) --foreign --ignore-deps \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps Makefile'; \ ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign --ignore-deps Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! echo ' $(SHELL) ./config.status'; \ ! $(SHELL) ./config.status;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! $(SHELL) ./config.status --recheck ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ! libagg.pc: $(top_builddir)/config.status $(srcdir)/libagg.pc.in ! cd $(top_builddir) && $(SHELL) ./config.status $@ ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! install-m4dataDATA: $(m4data_DATA) ! @$(NORMAL_INSTALL) ! test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)" ! @list='$(m4data_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f=$(am__strip_dir) \ ! echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \ ! $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \ ! done ! ! uninstall-m4dataDATA: ! @$(NORMAL_UNINSTALL) ! @list='$(m4data_DATA)'; for p in $$list; do \ ! f=$(am__strip_dir) \ ! echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \ ! rm -f "$(DESTDIR)$(m4datadir)/$$f"; \ ! done ! install-pkgconfigDATA: $(pkgconfig_DATA) ! @$(NORMAL_INSTALL) ! test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" ! @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f=$(am__strip_dir) \ ! echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ! $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ! done ! ! uninstall-pkgconfigDATA: ! @$(NORMAL_UNINSTALL) ! @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f=$(am__strip_dir) \ ! echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ! rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ! done ! ! # This directory's subdirectories are mostly independent; you can cd ! # into them and run `make' without going through this Makefile. ! # To change the values of `make' variables: instead of editing Makefiles, ! # (1) if the variable is set in `config.status', edit `config.status' ! # (which will cause the Makefiles to be regenerated when you run `make'); ! # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ ! dot_seen=no; \ ! target=`echo $@ | sed s/-recursive//`; \ ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! echo "Making $$target in $$subdir"; \ ! if test "$$subdir" = "."; then \ ! dot_seen=yes; \ ! local_target="$$target-am"; \ ! else \ ! local_target="$$target"; \ ! fi; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ ! done; \ ! if test "$$dot_seen" = "no"; then \ ! $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ! fi; test -z "$$fail" ! ! mostlyclean-recursive clean-recursive distclean-recursive \ ! maintainer-clean-recursive: ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ ! dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ ! done; \ ! rev="$$rev ."; \ ! target=`echo $@ | sed s/-recursive//`; \ ! for subdir in $$rev; do \ ! echo "Making $$target in $$subdir"; \ ! if test "$$subdir" = "."; then \ ! local_target="$$target-am"; \ ! else \ ! local_target="$$target"; \ ! fi; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ ! done && test -z "$$fail" ! tags-recursive: ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ! done ! ctags-recursive: ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ! done ! ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! tags: TAGS ! ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ! include_option=--etags-include; \ ! empty_fix=.; \ ! else \ ! include_option=--include; \ ! empty_fix=; \ ! fi; \ ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ ! test ! -f $$subdir/TAGS || \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ! fi; \ ! done; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ! test -n "$$unique" || unique=$$empty_fix; \ ! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique; \ ! fi ! ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here ! ! distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! ! distdir: $(DISTFILES) ! $(am__remove_distdir) ! mkdir $(distdir) ! $(mkdir_p) $(distdir)/. ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ ! if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ! else \ ! test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ ! fi; \ ! done ! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ ! test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ ! || exit 1; \ ! distdir=`$(am__cd) $(distdir) && pwd`; \ ! top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$$top_distdir" \ ! distdir="$$distdir/$$subdir" \ ! distdir) \ ! || exit 1; \ ! fi; \ ! done ! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ! || chmod -R a+r $(distdir) ! dist-gzip: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! dist-bzip2: distdir ! tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 ! $(am__remove_distdir) ! ! dist-tarZ: distdir ! tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z ! $(am__remove_distdir) ! ! dist-shar: distdir ! shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz ! $(am__remove_distdir) ! ! dist-zip: distdir ! -rm -f $(distdir).zip ! zip -rq $(distdir).zip $(distdir) ! $(am__remove_distdir) ! ! dist dist-all: distdir ! tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! case '$(DIST_ARCHIVES)' in \ ! *.tar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ! *.tar.bz2*) \ ! bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ! *.tar.Z*) \ ! uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ ! *.shar.gz*) \ ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ! *.zip*) \ ! unzip $(distdir).zip ;;\ ! esac ! chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/_build ! mkdir $(distdir)/_inst ! chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ! && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ! && cd $(distdir)/_build \ ! && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ! $(DISTCHECK_CONFIGURE_FLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ! distuninstallcheck \ ! && chmod -R a-w "$$dc_install_base" \ ! && ({ \ ! (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ! } || { rm -rf "$$dc_destdir"; exit 1; }) \ ! && rm -rf "$$dc_destdir" \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && rm -rf $(DIST_ARCHIVES) \ ! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ! $(am__remove_distdir) ! @(echo "$(distdir) archives ready for distribution: "; \ ! list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ! sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' ! distuninstallcheck: ! @cd $(distuninstallcheck_dir) \ ! && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! if test -n "$(DESTDIR)"; then \ ! echo " (check DESTDIR support)"; \ ! fi ; \ ! $(distuninstallcheck_listfiles) ; \ ! exit 1; } >&2 ! distcleancheck: distclean ! @if test '$(srcdir)' = . ; then \ ! echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ! exit 1 ; \ ! fi ! @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left in build directory after distclean:" ; \ ! $(distcleancheck_listfiles) ; \ ! exit 1; } >&2 ! check-am: all-am ! check: check-recursive ! all-am: Makefile $(DATA) ! installdirs: installdirs-recursive ! installdirs-am: ! for dir in "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done ! install: install-recursive ! install-exec: install-exec-recursive ! install-data: install-data-recursive ! uninstall: uninstall-recursive ! ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! ! installcheck: installcheck-recursive ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ! mostlyclean-generic: ! ! clean-generic: ! ! distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ! ! maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! ! clean-am: clean-generic clean-libtool mostlyclean-am ! ! distclean: distclean-recursive ! -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -f Makefile ! distclean-am: clean-am distclean-generic distclean-libtool \ ! distclean-tags ! ! dvi: dvi-recursive ! ! dvi-am: ! ! html: html-recursive ! ! info: info-recursive ! ! info-am: ! ! install-data-am: install-m4dataDATA install-pkgconfigDATA ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: ! ! maintainer-clean: maintainer-clean-recursive ! -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf $(top_srcdir)/autom4te.cache ! -rm -f Makefile ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-recursive ! ! pdf-am: ! ! ps: ps-recursive ! ! ps-am: ! ! uninstall-am: uninstall-info-am uninstall-m4dataDATA \ ! uninstall-pkgconfigDATA ! uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ ! check-am clean clean-generic clean-libtool clean-recursive \ ! ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ ! dist-shar dist-tarZ dist-zip distcheck distclean \ ! distclean-generic distclean-libtool distclean-recursive \ ! distclean-tags distcleancheck distdir distuninstallcheck dvi \ ! dvi-am html html-am info info-am install install-am \ ! install-data install-data-am install-exec install-exec-am \ ! install-info install-info-am install-m4dataDATA install-man \ ! install-pkgconfigDATA install-strip installcheck \ ! installcheck-am installdirs installdirs-am maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive \ ! mostlyclean mostlyclean-generic mostlyclean-libtool \ ! mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am uninstall-m4dataDATA \ ! uninstall-pkgconfigDATA ! # Tell versions [3.59,3.63) of GNU make to not export all variables. ! # Otherwise a system limit (for SysV at least) may be exceeded. ! .NOEXPORT: --- 1,9 ---- ! all: lib ! src/libagg.a: ! cd src; make ! lib: src/libagg.a ! clean: ! cd src; make clean Index: roadmap_canvas.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/roadmap_canvas.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** roadmap_canvas.cpp 17 Nov 2006 16:47:11 -0000 1.9 --- roadmap_canvas.cpp 7 Jan 2007 09:54:26 -0000 1.10 *************** *** 52,56 **** #ifdef USE_FRIBIDI #include <fribidi.h> - #define MAX_STR_LEN 65000 #endif --- 52,55 ---- *************** *** 68,71 **** --- 67,71 ---- #include "../roadmap_canvas_agg.h" + //#define RGB565 #ifdef RGB565 typedef agg::pixfmt_rgb565 pixfmt; *************** *** 722,726 **** agg_renb.attach(agg_pixf); agg_renb.reset_clipping(true); ! ras.clip_box(0, 0, agg_renb.width(), agg_renb.height()); agg::glyph_rendering gren = agg::glyph_ren_outline; --- 722,726 ---- agg_renb.attach(agg_pixf); agg_renb.reset_clipping(true); ! ras.clip_box(0, 0, agg_renb.width() - 1, agg_renb.height() - 1); agg::glyph_rendering gren = agg::glyph_ren_outline; *************** *** 728,732 **** roadmap_config_declare ! ("preferences", &RoadMapConfigFont, "font.ttf"); char font_file[255]; --- 728,732 ---- roadmap_config_declare ! ("preferences", &RoadMapConfigFont, "font.ttf", NULL); char font_file[255]; Index: copying =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/copying,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** copying 12 May 2006 13:29:29 -0000 1.1 --- copying 7 Jan 2007 09:54:26 -0000 1.2 *************** *** 1,65 **** ! The Anti-Grain Geometry Project ! A high quality rendering engine for C++ ! http://antigrain.com ! Anti-Grain Geometry has dual licensing model. The Modified BSD ! License was first added in version v2.4 just for convenience. ! It is a simple, permissive non-copyleft free software license, ! compatible with the GNU GPL. It's well proven and recognizable. ! See http://www.fsf.org/licensing/licenses/index_html#ModifiedBSD ! for details. ! Note that the Modified BSD license DOES NOT restrict your rights ! if you choose the Anti-Grain Geometry Public License. ! Anti-Grain Geometry Public License ! ==================================================== ! Anti-Grain Geometry - Version 2.4 ! Copyright (C) 2002-2005 Maxim Shemanarev (McSeem) ! Permission to copy, use, modify, sell and distribute this software ! is granted provided this copyright notice appears in all copies. ! This software is provided "as is" without express or implied ! warranty, and with no claim as to its suitability for any purpose. ! Modified BSD License ! ==================================================== ! Anti-Grain Geometry - Version 2.4 ! Copyright (C) 2002-2005 Maxim Shemanarev (McSeem) ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! 1. Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! 2. Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in ! the documentation and/or other materials provided with the ! distribution. ! 3. The name of the author may not be used to endorse or promote ! products derived from this software without specific prior ! written permission. ! THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ! IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ! WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ! ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, ! INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ! (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ! SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ! HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ! STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ! IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ! POSSIBILITY OF SUCH DAMAGE. --- 1,339 ---- ! GNU GENERAL PUBLIC LICENSE ! Version 2, June 1991 ! Copyright (C) 1989, 1991 Free Software Foundation, Inc., ! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ! Everyone is permitted to copy and distribute verbatim copies ! of this license document, but changing it is not allowed. ! Preamble + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public + License is intended to guarantee your freedom to share and change free + software--to make sure the software is free for all its users. This + General Public License applies to most of the Free Software + Foundation's software and to any other program whose authors commit to + using it. (Some other Free Software Foundation software is covered by + the GNU Lesser General Public License instead.) You can apply it to + your programs, too. + When we speak of free software, we are referring to freedom, not + price. Our General Public Licenses are designed to make sure that you + have the freedom to distribute copies of free software (and charge for + this service if you wish), that you receive source code or can get it + if you want it, that you can change the software or use pieces of it + in new free programs; and that you know you can do these things. + To protect your rights, we need to make restrictions that forbid + anyone to deny you these rights or to ask you to surrender the rights. + These restrictions translate to certain responsibilities for you if you + distribute copies of the software, or if you modify it. ! For example, if you distribute copies of such a program, whether ! gratis or for a fee, you must give the recipients all the rights that ! you have. You must make sure that they, too, receive or can get the ! source code. And you must show them these terms so they know their ! rights. ! We protect your rights with two steps: (1) copyright the software, and ! (2) offer you this license which gives you legal permission to copy, ! distribute and/or modify the software. ! Also, for each author's protection and ours, we want to make certain ! that everyone understands that there is no warranty for this free ! software. If the software is modified by someone else and passed on, we ! want its recipients to know that what they have is not the original, so ! that any problems introduced by others will not reflect on the original ! authors' reputations. + Finally, any free program is threatened constantly by software + patents. We wish to avoid the danger that redistributors of a free + program will individually obtain patent licenses, in effect making the + program proprietary. To prevent this, we have made it clear that any + patent must be licensed for everyone's free use or not licensed at all. + The precise terms and conditions for copying, distribution and + modification follow. + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 0. This License applies to any program or other work which contains + a notice placed by the copyright holder saying it may be distributed + under the terms of this General Public License. The "Program", below, + refers to any such program or work, and a "work based on the Program" + means either the Program or any derivative work under copyright law: + that is to say, a work containing the Program or a portion of it, + either verbatim or with modifications and/or translated into another + language. (Hereinafter, translation is included without limitation in + the term "modification".) Each licensee is addressed as "you". ! Activities other than copying, distribution and modification are not ! covered by this License; they are outside its scope. The act of ! running the Program is not restricted, and the output from the Program ! is covered only if its contents constitute a work based on the ! Program (independent of having been made by running the Program). ! Whether that is true depends on what the Program does. ! 1. You may copy and distribute verbatim copies of the Program's ! source code as you receive it, in any medium, provided that you ! conspicuously and appropriately publish on each copy an appropriate ! copyright notice and disclaimer of warranty; keep intact all the ! notices that refer to this License and to the absence of any warranty; ! and give any other recipients of the Program a copy of this License ! along with the Program. ! You may charge a fee for the physical act of transferring a copy, and ! you may at your option offer warranty protection in exchange for a fee. ! 2. You may modify your copy or copies of the Program or any portion ! of it, thus forming a work based on the Program, and copy and ! distribute such modifications or work under the terms of Section 1 ! above, provided that you also meet all of these conditions: ! a) You must cause the modified files to carry prominent notices ! stating that you changed the files and the date of any change. ! b) You must cause any work that you distribute or publish, that in ! whole or in part contains or is derived from the Program or any ! part thereof, to be licensed as a whole at no charge to all third ! parties under the terms of this License. ! ! c) If the modified program normally reads commands interactively ! when run, you must cause it, when started running for such ! interactive use in the most ordinary way, to print or display an ! announcement including an appropriate copyright notice and a ! notice that there is no warranty (or else, saying that you provide ! a warranty) and that users may redistribute the program under ! these conditions, and telling the user how to view a copy of this ! License. (Exception: if the Program itself is interactive but ! does not normally print such an announcement, your work based on ! the Program is not required to print an announcement.) ! ! These requirements apply to the modified work as a whole. If ! identifiable sections of that work are not derived from the Program, ! and can be reasonably considered independent and separate works in ! themselves, then this License, and its terms, do not apply to those ! sections when you distribute them as separate works. But when you ! distribute the same sections as part of a whole which is a work based ! on the Program, the distribution of the whole must be on the terms of ! this License, whose permissions for other licensees extend to the ! entire whole, and thus to each and every part regardless of who wrote it. ! ! Thus, it is not the intent of this section to claim rights or contest ! your rights to work written entirely by you; rather, the intent is to ! exercise the right to control the distribution of derivative or ! collective works based on the Program. ! ! In addition, mere aggregation of another work not based on the Program ! with the Program (or with a work based on the Program) on a volume of ! a storage or distribution medium does not bring the other work under ! the scope of this License. ! ! 3. You may copy and distribute the Program (or a work based on it, ! under Section 2) in object code or executable form under the terms of ! Sections 1 and 2 above provided that you also do one of the following: ! ! a) Accompany it with the complete corresponding machine-readable ! source code, which must be distributed under the terms of Sections ! 1 and 2 above on a medium customarily used for software interchange; or, ! ! b) Accompany it with a written offer, valid for at least three ! years, to give any third party, for a charge no more than your ! cost of physically performing source distribution, a complete ! machine-readable copy of the corresponding source code, to be ! distributed under the terms of Sections 1 and 2 above on a medium ! customarily used for software interchange; or, ! ! c) Accompany it with the information you received as to the offer ! to distribute corresponding source code. (This alternative is ! allowed only for noncommercial distribution and only if you ! received the program in object code or executable form with such ! an offer, in accord with Subsection b above.) ! ! The source code for a work means the preferred form of the work for ! making modifications to it. For an executable work, complete source ! code means all the source code for all modules it contains, plus any ! associated interface definition files, plus the scripts used to ! control compilation and installation of the executable. However, as a ! special exception, the source code distributed need not include ! anything that is normally distributed (in either source or binary ! form) with the major components (compiler, kernel, and so on) of the ! operating system on which the executable runs, unless that component ! itself accompanies the executable. ! ! If distribution of executable or object code is made by offering ! access to copy from a designated place, then offering equivalent ! access to copy the source code from the same place counts as ! distribution of the source code, even though third parties are not ! compelled to copy the source along with the object code. ! ! 4. You may not copy, modify, sublicense, or distribute the Program ! except as expressly provided under this License. Any attempt ! otherwise to copy, modify, sublicense or distribute the Program is ! void, and will automatically terminate your rights under this License. ! However, parties who have received copies, or rights, from you under ! this License will not have their licenses terminated so long as such ! parties remain in full compliance. ! ! 5. You are not required to accept this License, since you have not ! signed it. However, nothing else grants you permission to modify or ! distribute the Program or its derivative works. These actions are ! prohibited by law if you do not accept this License. Therefore, by ! modifying or distributing the Program (or any work based on the ! Program), you indicate your acceptance of this License to do so, and ! all its terms and conditions for copying, distributing or modifying ! the Program or works based on it. ! ! 6. Each time you redistribute the Program (or any work based on the ! Program), the recipient automatically receives a license from the ! original licensor to copy, distribute or modify the Program subject to ! these terms and conditions. You may not impose any further ! restrictions on the recipients' exercise of the rights granted herein. ! You are not responsible for enforcing compliance by third parties to ! this License. ! ! 7. If, as a consequence of a court judgment or allegation of patent ! infringement or for any other reason (not limited to patent issues), ! conditions are imposed on you (whether by court order, agreement or ! otherwise) that contradict the conditions of this License, they do not ! excuse you from the conditions of this License. If you cannot ! distribute so as to satisfy simultaneously your obligations under this ! License and any other pertinent obligations, then as a consequence you ! may not distribute the Program at all. For example, if a patent ! license would not permit royalty-free redistribution of the Program by ! all those who receive copies directly or indirectly through you, then ! the only way you could satisfy both it and this License would be to ! refrain entirely from distribution of the Program. ! ! If any portion of this section is held invalid or unenforceable under ! any particular circumstance, the balance of the section is intended to ! apply and the section as a whole is intended to apply in other ! circumstances. ! ! It is not the purpose of this section to induce you to infringe any ! patents or other property right claims or to contest validity of any ! such claims; this section has the sole purpose of protecting the ! integrity of the free software distribution system, which is ! implemented by public license practices. Many people have made ! generous contributions to the wide range of software distributed ! through that system in reliance on consistent application of that ! system; it is up to the author/donor to decide if he or she is willing ! to distribute software through any other system and a licensee cannot ! impose that choice. + This section is intended to make thoroughly clear what is believed to + be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in + certain countries either by patents or by copyrighted interfaces, the + original copyright holder who places the Program under this License + may add an explicit geographical distribution limitation excluding + those countries, so that distribution is permitted only in or among + countries not thus excluded. In such case, this License incorporates + the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions + of the General Public License from time to time. Such new versions will + be similar in spirit to the present version, but may differ in detail to + address new problems or concerns. + + Each version is given a distinguishing version number. If the Program + specifies a version number of this License which applies to it and "any + later version", you have the option of following the terms and conditions + either of that version or of any later version published by the Free + Software Foundation. If the Program does not specify a version number of + this License, you may choose any version ever published by the Free Software + Foundation. + + 10. If you wish to incorporate parts of the Program into other free + programs whose distribution conditions are different, write to the author + to ask for permission. For software which is copyrighted by the Free + Software Foundation, write to the Free Software Foundation; we sometimes + make exceptions for this. Our decision will be guided by the two goals + of preserving the free status of all derivatives of our free software and + of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY + FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES + PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED + OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS + TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, + REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR + REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, + INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING + OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED + TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY + YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER + PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest + possible use to the public, the best way to achieve this is to make it + free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest + to attach them to the start of each source file to most effectively + convey the exclusion of warranty; and each file should have at least + the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Also add information on how to contact you by electronic and paper mail. + + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + + The hypothetical commands `show w' and `show c' should show the appropriate + parts of the General Public License. Of course, the commands you use may + be called something other than `show w' and `show c'; they could even be + mouse-clicks or menu items--whatever suits your program. + + You should also get your employer (if you work as a programmer) or your + school, if any, to sign a "copyright disclaimer" for the program, if + necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + + This General Public License does not permit incorporating your program into + proprietary programs. If your program is a subroutine library, you may + consider it more useful to permit linking proprietary applications with the + library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. Index: authors =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/authors,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** authors 12 May 2006 13:29:29 -0000 1.1 --- authors 7 Jan 2007 09:54:26 -0000 1.2 *************** *** 1,2 **** ! Anti-Grain Geometry - Version 2.4 ! Copyright (C) 2002-2005 Maxim Shemanarev (McSeem) --- 1,3 ---- ! Anti-Grain Geometry (AGG) - Version 2.5 ! A high quality rendering engine for C++ ! Copyright (C) 2002-2006 Maxim Shemanarev |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:55:00
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/font_win32_tt In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/font_win32_tt Modified Files: agg_font_win32_tt.cpp agg_font_win32_tt.h Log Message: Update to agg 2.5 Index: agg_font_win32_tt.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/font_win32_tt/agg_font_win32_tt.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_font_win32_tt.cpp 12 May 2006 13:29:29 -0000 1.1 --- agg_font_win32_tt.cpp 7 Jan 2007 09:54:27 -0000 1.2 *************** *** 1,15 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_font_win32_tt.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/font_win32_tt/agg_font_win32_tt.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_font_win32_tt.h 12 May 2006 13:29:29 -0000 1.1 --- agg_font_win32_tt.h 7 Jan 2007 09:54:27 -0000 1.2 *************** *** 1,15 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:55:00
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/font_freetype In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/font_freetype Modified Files: agg_font_freetype.cpp agg_font_freetype.h Log Message: Update to agg 2.5 Index: agg_font_freetype.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/font_freetype/agg_font_freetype.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_font_freetype.cpp 12 May 2006 13:29:29 -0000 1.1 --- agg_font_freetype.cpp 7 Jan 2007 09:54:27 -0000 1.2 *************** *** 1,18 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com //---------------------------------------------------------------------------- - #include <stdio.h> #include "agg_font_freetype.h" --- 1,26 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- #include <stdio.h> #include "agg_font_freetype.h" Index: agg_font_freetype.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/font_freetype/agg_font_freetype.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_font_freetype.h 12 May 2006 13:29:29 -0000 1.1 --- agg_font_freetype.h 7 Jan 2007 09:54:27 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // See implementation agg_font_freetype.cpp ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- |
Update of /cvsroot/roadmap/roadmap_editor/src/agg/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/src Modified Files: Makefile agg_arc.cpp agg_arrowhead.cpp agg_bezier_arc.cpp agg_bspline.cpp agg_curves.cpp agg_embedded_raster_fonts.cpp agg_gsv_text.cpp agg_image_filters.cpp agg_line_aa_basics.cpp agg_line_profile_aa.cpp agg_rounded_rect.cpp agg_sqrt_tables.cpp agg_trans_affine.cpp agg_trans_double_path.cpp agg_trans_single_path.cpp agg_trans_warp_magnifier.cpp agg_vcgen_bspline.cpp agg_vcgen_contour.cpp agg_vcgen_dash.cpp agg_vcgen_markers_term.cpp agg_vcgen_smooth_poly1.cpp agg_vcgen_stroke.cpp agg_vpgen_clip_polygon.cpp agg_vpgen_clip_polyline.cpp agg_vpgen_segmentator.cpp copying Log Message: Update to agg 2.5 Index: agg_vpgen_segmentator.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/agg_vpgen_segmentator.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_vpgen_segmentator.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_vpgen_segmentator.cpp 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,67 **** ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- ! // Contact: mc...@an... ! // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! ! #include <math.h> ! #include "agg_vpgen_segmentator.h" ! ! namespace agg ! { ! ! void vpgen_segmentator::move_to(double x, double y) ! { ! m_x1 = x; ! m_y1 = y; ! m_dx = 0.0; ! m_dy = 0.0; ! m_dl = 2.0; ! m_ddl = 2.0; ! m_cmd = path_cmd_move_to; ! } ! ! void vpgen_segmentator::line_to(double x, double y) ! { ! m_x1 += m_dx; ! m_y1 += m_dy; ! m_dx = x - m_x1; ! m_dy = y - m_y1; ! double len = sqrt(m_dx * m_dx + m_dy * m_dy) * m_approximation_scale; ! if(len < 1e-30) len = 1e-30; ! m_ddl = 1.0 / len; ! m_dl = (m_cmd == path_cmd_move_to) ? 0.0 : m_ddl; ! if(m_cmd == path_cmd_stop) m_cmd = path_cmd_line_to; ! } ! ! unsigned vpgen_segmentator::vertex(double* x, double* y) ! { ! if(m_cmd == path_cmd_stop) return path_cmd_stop; ! ! unsigned cmd = m_cmd; ! m_cmd = path_cmd_line_to; ! if(m_dl >= 1.0 - m_ddl) ! { ! m_dl = 1.0; ! m_cmd = path_cmd_stop; ! *x = m_x1 + m_dx; ! *y = m_y1 + m_dy; ! return cmd; ! } ! *x = m_x1 + m_dx * m_dl; ! *y = m_y1 + m_dy * m_dl; ! m_dl += m_ddl; ! return cmd; ! } ! ! } ! --- 1,76 ---- ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev ! // Contact: mc...@an... ! // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. ! //---------------------------------------------------------------------------- ! ! #include <math.h> ! #include "agg_vpgen_segmentator.h" ! ! namespace agg ! { ! ! void vpgen_segmentator::move_to(double x, double y) ! { ! m_x1 = x; ! m_y1 = y; ! m_dx = 0.0; ! m_dy = 0.0; ! m_dl = 2.0; ! m_ddl = 2.0; ! m_cmd = path_cmd_move_to; ! } ! ! void vpgen_segmentator::line_to(double x, double y) ! { ! m_x1 += m_dx; ! m_y1 += m_dy; ! m_dx = x - m_x1; ! m_dy = y - m_y1; ! double len = sqrt(m_dx * m_dx + m_dy * m_dy) * m_approximation_scale; ! if(len < 1e-30) len = 1e-30; ! m_ddl = 1.0 / len; ! m_dl = (m_cmd == path_cmd_move_to) ? 0.0 : m_ddl; ! if(m_cmd == path_cmd_stop) m_cmd = path_cmd_line_to; ! } ! ! unsigned vpgen_segmentator::vertex(double* x, double* y) ! { ! if(m_cmd == path_cmd_stop) return path_cmd_stop; ! ! unsigned cmd = m_cmd; ! m_cmd = path_cmd_line_to; ! if(m_dl >= 1.0 - m_ddl) ! { ! m_dl = 1.0; ! m_cmd = path_cmd_stop; ! *x = m_x1 + m_dx; ! *y = m_y1 + m_dy; ! return cmd; ! } ! *x = m_x1 + m_dx * m_dl; ! *y = m_y1 + m_dy * m_dl; ! m_dl += m_ddl; ! return cmd; ! } ! ! } ! Index: agg_image_filters.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/agg_image_filters.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_image_filters.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_image_filters.cpp 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,103 **** ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- ! // Contact: mc...@an... ! // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // Filtering class image_filter_lut implemantation ! // ! //---------------------------------------------------------------------------- ! ! ! #include "agg_image_filters.h" ! ! ! namespace agg ! { ! //-------------------------------------------------------------------- ! void image_filter_lut::realloc_lut(double radius) ! { ! m_radius = radius; ! m_diameter = uceil(radius) * 2; ! m_start = -int(m_diameter / 2 - 1); ! unsigned size = m_diameter << image_subpixel_shift; ! if(size > m_weight_array.size()) ! { ! m_weight_array.resize(size); ! } ! } ! ! ! ! //-------------------------------------------------------------------- ! // This function normalizes integer values and corrects the rounding ! // errors. It doesn't do anything with the source floating point values ! // (m_weight_array_dbl), it corrects only integers according to the rule ! // of 1.0 which means that any sum of pixel weights must be equal to 1.0. ! // So, the filter function must produce a graph of the proper shape. ! //-------------------------------------------------------------------- ! void image_filter_lut::normalize() ! { ! unsigned i; ! int flip = 1; ! ! for(i = 0; i < image_subpixel_scale; i++) ! { ! for(;;) ! { ! int sum = 0; ! unsigned j; ! for(j = 0; j < m_diameter; j++) ! { ! sum += m_weight_array[j * image_subpixel_scale + i]; ! } ! ! if(sum == image_filter_scale) break; ! ! double k = double(image_filter_scale) / double(sum); ! sum = 0; ! for(j = 0; j < m_diameter; j++) ! { ! sum += m_weight_array[j * image_subpixel_scale + i] = ! iround(m_weight_array[j * image_subpixel_scale + i] * k); ! } ! ! sum -= image_filter_scale; ! int inc = (sum > 0) ? -1 : 1; ! ! for(j = 0; j < m_diameter && sum; j++) ! { ! flip ^= 1; ! unsigned idx = flip ? m_diameter/2 + j/2 : m_diameter/2 - j/2; ! int v = m_weight_array[idx * image_subpixel_scale + i]; ! if(v < image_filter_scale) ! { ! m_weight_array[idx * image_subpixel_scale + i] += inc; ! sum += inc; ! } ! } ! } ! } ! ! unsigned pivot = m_diameter << (image_subpixel_shift - 1); ! ! for(i = 0; i < pivot; i++) ! { ! m_weight_array[pivot + i] = m_weight_array[pivot - i]; ! } ! unsigned end = (diameter() << image_subpixel_shift) - 1; ! m_weight_array[0] = m_weight_array[end]; ! } ! ! ! } ! --- 1,107 ---- ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev ! // Contact: mc...@an... ! // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. ! //---------------------------------------------------------------------------- ! ! #include "agg_image_filters.h" ! ! ! namespace agg ! { ! //-------------------------------------------------------------------- ! void image_filter_lut::realloc_lut(double radius) ! { ! m_radius = radius; ! m_diameter = uceil(radius) * 2; ! m_start = -int(m_diameter / 2 - 1); ! unsigned size = m_diameter << image_subpixel_shift; ! if(size > m_weight_array.size()) ! { ! m_weight_array.resize(size); ! } ! } ! ! ! ! //-------------------------------------------------------------------- ! // This function normalizes integer values and corrects the rounding ! // errors. It doesn't do anything with the source floating point values ! // (m_weight_array_dbl), it corrects only integers according to the rule ! // of 1.0 which means that any sum of pixel weights must be equal to 1.0. ! // So, the filter function must produce a graph of the proper shape. ! //-------------------------------------------------------------------- ! void image_filter_lut::normalize() ! { ! unsigned i; ! int flip = 1; ! ! for(i = 0; i < image_subpixel_scale; i++) ! { ! for(;;) ! { ! int sum = 0; ! unsigned j; ! for(j = 0; j < m_diameter; j++) ! { ! sum += m_weight_array[j * image_subpixel_scale + i]; ! } ! ! if(sum == image_filter_scale) break; ! ! double k = double(image_filter_scale) / double(sum); ! sum = 0; ! for(j = 0; j < m_diameter; j++) ! { ! sum += m_weight_array[j * image_subpixel_scale + i] = ! iround(m_weight_array[j * image_subpixel_scale + i] * k); ! } ! ! sum -= image_filter_scale; ! int inc = (sum > 0) ? -1 : 1; ! ! for(j = 0; j < m_diameter && sum; j++) ! { ! flip ^= 1; ! unsigned idx = flip ? m_diameter/2 + j/2 : m_diameter/2 - j/2; ! int v = m_weight_array[idx * image_subpixel_scale + i]; ! if(v < image_filter_scale) ! { ! m_weight_array[idx * image_subpixel_scale + i] += inc; ! sum += inc; ! } ! } ! } ! } ! ! unsigned pivot = m_diameter << (image_subpixel_shift - 1); ! ! for(i = 0; i < pivot; i++) ! { ! m_weight_array[pivot + i] = m_weight_array[pivot - i]; ! } ! unsigned end = (diameter() << image_subpixel_shift) - 1; ! m_weight_array[0] = m_weight_array[end]; ! } ! ! ! } ! Index: agg_rounded_rect.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/agg_rounded_rect.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_rounded_rect.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_rounded_rect.cpp 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,164 **** ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- ! // Contact: mc...@an... ! // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // Rounded rectangle vertex generator ! // ! //---------------------------------------------------------------------------- ! ! #include <math.h> ! #include "agg_rounded_rect.h" ! ! ! namespace agg ! { ! //------------------------------------------------------------------------ ! rounded_rect::rounded_rect(double x1, double y1, double x2, double y2, double r) : ! m_x1(x1), m_y1(y1), m_x2(x2), m_y2(y2), ! m_rx1(r), m_ry1(r), m_rx2(r), m_ry2(r), ! m_rx3(r), m_ry3(r), m_rx4(r), m_ry4(r) ! { ! if(x1 > x2) { m_x1 = x2; m_x2 = x1; } ! if(y1 > y2) { m_y1 = y2; m_y2 = y1; } ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::rect(double x1, double y1, double x2, double y2) ! { ! m_x1 = x1; ! m_y1 = y1; ! m_x2 = x2; ! m_y2 = y2; ! if(x1 > x2) { m_x1 = x2; m_x2 = x1; } ! if(y1 > y2) { m_y1 = y2; m_y2 = y1; } ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double r) ! { ! m_rx1 = m_ry1 = m_rx2 = m_ry2 = m_rx3 = m_ry3 = m_rx4 = m_ry4 = r; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double rx, double ry) ! { ! m_rx1 = m_rx2 = m_rx3 = m_rx4 = rx; ! m_ry1 = m_ry2 = m_ry3 = m_ry4 = ry; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double rx_bottom, double ry_bottom, ! double rx_top, double ry_top) ! { ! m_rx1 = m_rx2 = rx_bottom; ! m_rx3 = m_rx4 = rx_top; ! m_ry1 = m_ry2 = ry_bottom; ! m_ry3 = m_ry4 = ry_top; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double rx1, double ry1, double rx2, double ry2, ! double rx3, double ry3, double rx4, double ry4) ! { ! m_rx1 = rx1; m_ry1 = ry1; m_rx2 = rx2; m_ry2 = ry2; ! m_rx3 = rx3; m_ry3 = ry3; m_rx4 = rx4; m_ry4 = ry4; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::normalize_radius() ! { ! double dx = fabs(m_y2 - m_y1); ! double dy = fabs(m_x2 - m_x1); ! ! double k = 1.0; ! double t; ! t = dx / (m_rx1 + m_rx2); if(t < k) k = t; ! t = dx / (m_rx3 + m_rx4); if(t < k) k = t; ! t = dy / (m_ry1 + m_ry2); if(t < k) k = t; ! t = dy / (m_ry3 + m_ry4); if(t < k) k = t; ! ! if(k < 1.0) ! { ! m_rx1 *= k; m_ry1 *= k; m_rx2 *= k; m_ry2 *= k; ! m_rx3 *= k; m_ry3 *= k; m_rx4 *= k; m_ry4 *= k; ! } ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::rewind(unsigned) ! { ! m_status = 0; ! } ! ! //-------------------------------------------------------------------- ! unsigned rounded_rect::vertex(double* x, double* y) ! { ! unsigned cmd = path_cmd_stop; ! switch(m_status) ! { ! case 0: ! m_arc.init(m_x1 + m_rx1, m_y1 + m_ry1, m_rx1, m_ry1, ! pi, pi+pi*0.5); ! m_arc.rewind(0); ! m_status++; ! ! case 1: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return cmd; ! ! case 2: ! m_arc.init(m_x2 - m_rx2, m_y1 + m_ry2, m_rx2, m_ry2, ! pi+pi*0.5, 0.0); ! m_arc.rewind(0); ! m_status++; ! ! case 3: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return path_cmd_line_to; ! ! case 4: ! m_arc.init(m_x2 - m_rx3, m_y2 - m_ry3, m_rx3, m_ry3, ! 0.0, pi*0.5); ! m_arc.rewind(0); ! m_status++; ! ! case 5: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return path_cmd_line_to; ! ! case 6: ! m_arc.init(m_x1 + m_rx4, m_y2 - m_ry4, m_rx4, m_ry4, ! pi*0.5, pi); ! m_arc.rewind(0); ! m_status++; ! ! case 7: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return path_cmd_line_to; ! ! case 8: ! cmd = path_cmd_end_poly | path_flags_close | path_flags_ccw; ! m_status++; ! break; ! } ! return cmd; ! } ! ! ! } ! --- 1,169 ---- ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev ! // Contact: mc...@an... ! // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. ! //---------------------------------------------------------------------------- ! ! #include <math.h> ! #include "agg_rounded_rect.h" ! ! ! namespace agg ! { ! //------------------------------------------------------------------------ ! rounded_rect::rounded_rect(double x1, double y1, double x2, double y2, double r) : ! m_x1(x1), m_y1(y1), m_x2(x2), m_y2(y2), ! m_rx1(r), m_ry1(r), m_rx2(r), m_ry2(r), ! m_rx3(r), m_ry3(r), m_rx4(r), m_ry4(r) ! { ! if(x1 > x2) { m_x1 = x2; m_x2 = x1; } ! if(y1 > y2) { m_y1 = y2; m_y2 = y1; } ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::rect(double x1, double y1, double x2, double y2) ! { ! m_x1 = x1; ! m_y1 = y1; ! m_x2 = x2; ! m_y2 = y2; ! if(x1 > x2) { m_x1 = x2; m_x2 = x1; } ! if(y1 > y2) { m_y1 = y2; m_y2 = y1; } ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double r) ! { ! m_rx1 = m_ry1 = m_rx2 = m_ry2 = m_rx3 = m_ry3 = m_rx4 = m_ry4 = r; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double rx, double ry) ! { ! m_rx1 = m_rx2 = m_rx3 = m_rx4 = rx; ! m_ry1 = m_ry2 = m_ry3 = m_ry4 = ry; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double rx_bottom, double ry_bottom, ! double rx_top, double ry_top) ! { ! m_rx1 = m_rx2 = rx_bottom; ! m_rx3 = m_rx4 = rx_top; ! m_ry1 = m_ry2 = ry_bottom; ! m_ry3 = m_ry4 = ry_top; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::radius(double rx1, double ry1, double rx2, double ry2, ! double rx3, double ry3, double rx4, double ry4) ! { ! m_rx1 = rx1; m_ry1 = ry1; m_rx2 = rx2; m_ry2 = ry2; ! m_rx3 = rx3; m_ry3 = ry3; m_rx4 = rx4; m_ry4 = ry4; ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::normalize_radius() ! { ! double dx = fabs(m_y2 - m_y1); ! double dy = fabs(m_x2 - m_x1); ! ! double k = 1.0; ! double t; ! t = dx / (m_rx1 + m_rx2); if(t < k) k = t; ! t = dx / (m_rx3 + m_rx4); if(t < k) k = t; ! t = dy / (m_ry1 + m_ry2); if(t < k) k = t; ! t = dy / (m_ry3 + m_ry4); if(t < k) k = t; ! ! if(k < 1.0) ! { ! m_rx1 *= k; m_ry1 *= k; m_rx2 *= k; m_ry2 *= k; ! m_rx3 *= k; m_ry3 *= k; m_rx4 *= k; m_ry4 *= k; ! } ! } ! ! //-------------------------------------------------------------------- ! void rounded_rect::rewind(unsigned) ! { ! m_status = 0; ! } ! ! //-------------------------------------------------------------------- ! unsigned rounded_rect::vertex(double* x, double* y) ! { ! unsigned cmd = path_cmd_stop; ! switch(m_status) ! { ! case 0: ! m_arc.init(m_x1 + m_rx1, m_y1 + m_ry1, m_rx1, m_ry1, ! pi, pi+pi*0.5); ! m_arc.rewind(0); ! m_status++; ! ! case 1: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return cmd; ! ! case 2: ! m_arc.init(m_x2 - m_rx2, m_y1 + m_ry2, m_rx2, m_ry2, ! pi+pi*0.5, 0.0); ! m_arc.rewind(0); ! m_status++; ! ! case 3: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return path_cmd_line_to; ! ! case 4: ! m_arc.init(m_x2 - m_rx3, m_y2 - m_ry3, m_rx3, m_ry3, ! 0.0, pi*0.5); ! m_arc.rewind(0); ! m_status++; ! ! case 5: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return path_cmd_line_to; ! ! case 6: ! m_arc.init(m_x1 + m_rx4, m_y2 - m_ry4, m_rx4, m_ry4, ! pi*0.5, pi); ! m_arc.rewind(0); ! m_status++; ! ! case 7: ! cmd = m_arc.vertex(x, y); ! if(is_stop(cmd)) m_status++; ! else return path_cmd_line_to; ! ! case 8: ! cmd = path_cmd_end_poly | path_flags_close | path_flags_ccw; ! m_status++; ! break; ! } ! return cmd; ! } ! ! ! } ! Index: agg_vcgen_markers_term.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/agg_vcgen_markers_term.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_vcgen_markers_term.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_vcgen_markers_term.cpp 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,103 **** ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- ! // Contact: mc...@an... ! // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // Terminal markers generator (arrowhead/arrowtail) ! // ! //---------------------------------------------------------------------------- ! ! #include "agg_vcgen_markers_term.h" ! ! namespace agg ! { ! ! //------------------------------------------------------------------------ ! void vcgen_markers_term::remove_all() ! { ! m_markers.remove_all(); ! } ! ! ! //------------------------------------------------------------------------ ! void vcgen_markers_term::add_vertex(double x, double y, unsigned cmd) ! { ! if(is_move_to(cmd)) ! { ! if(m_markers.size() & 1) ! { ! // Initial state, the first coordinate was added. ! // If two of more calls of start_vertex() occures ! // we just modify the last one. ! m_markers.modify_last(coord_type(x, y)); ! } ! else ! { ! m_markers.add(coord_type(x, y)); ! } ! } ! else ! { ! if(is_vertex(cmd)) ! { ! if(m_markers.size() & 1) ! { ! // Initial state, the first coordinate was added. ! // Add three more points, 0,1,1,0 ! m_markers.add(coord_type(x, y)); ! m_markers.add(m_markers[m_markers.size() - 1]); ! m_markers.add(m_markers[m_markers.size() - 3]); ! } ! else ! { ! if(m_markers.size()) ! { ! // Replace two last points: 0,1,1,0 -> 0,1,2,1 ! m_markers[m_markers.size() - 1] = m_markers[m_markers.size() - 2]; ! m_markers[m_markers.size() - 2] = coord_type(x, y); ! } ! } ! } ! } ! } ! ! ! //------------------------------------------------------------------------ ! void vcgen_markers_term::rewind(unsigned path_id) ! { ! m_curr_id = path_id * 2; ! m_curr_idx = m_curr_id; ! } ! ! ! //------------------------------------------------------------------------ ! unsigned vcgen_markers_term::vertex(double* x, double* y) ! { ! if(m_curr_id > 2 || m_curr_idx >= m_markers.size()) ! { ! return path_cmd_stop; ! } ! const coord_type& c = m_markers[m_curr_idx]; ! *x = c.x; ! *y = c.y; ! if(m_curr_idx & 1) ! { ! m_curr_idx += 3; ! return path_cmd_line_to; ! } ! ++m_curr_idx; ! return path_cmd_move_to; ! } ! ! ! } --- 1,108 ---- ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev ! // Contact: mc...@an... ! // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. ! //---------------------------------------------------------------------------- ! ! #include "agg_vcgen_markers_term.h" ! ! namespace agg ! { ! ! //------------------------------------------------------------------------ ! void vcgen_markers_term::remove_all() ! { ! m_markers.remove_all(); ! } ! ! ! //------------------------------------------------------------------------ ! void vcgen_markers_term::add_vertex(double x, double y, unsigned cmd) ! { ! if(is_move_to(cmd)) ! { ! if(m_markers.size() & 1) ! { ! // Initial state, the first coordinate was added. ! // If two of more calls of start_vertex() occures ! // we just modify the last one. ! m_markers.modify_last(coord_type(x, y)); ! } ! else ! { ! m_markers.add(coord_type(x, y)); ! } ! } ! else ! { ! if(is_vertex(cmd)) ! { ! if(m_markers.size() & 1) ! { ! // Initial state, the first coordinate was added. ! // Add three more points, 0,1,1,0 ! m_markers.add(coord_type(x, y)); ! m_markers.add(m_markers[m_markers.size() - 1]); ! m_markers.add(m_markers[m_markers.size() - 3]); ! } ! else ! { ! if(m_markers.size()) ! { ! // Replace two last points: 0,1,1,0 -> 0,1,2,1 ! m_markers[m_markers.size() - 1] = m_markers[m_markers.size() - 2]; ! m_markers[m_markers.size() - 2] = coord_type(x, y); ! } ! } ! } ! } ! } ! ! ! //------------------------------------------------------------------------ ! void vcgen_markers_term::rewind(unsigned path_id) ! { ! m_curr_id = path_id * 2; ! m_curr_idx = m_curr_id; ! } ! ! ! //------------------------------------------------------------------------ ! unsigned vcgen_markers_term::vertex(double* x, double* y) ! { ! if(m_curr_id > 2 || m_curr_idx >= m_markers.size()) ! { ! return path_cmd_stop; ! } ! const coord_type& c = m_markers[m_curr_idx]; ! *x = c.x; ! *y = c.y; ! if(m_curr_idx & 1) ! { ! m_curr_idx += 3; ! return path_cmd_line_to; ! } ! ++m_curr_idx; ! return path_cmd_move_to; ! } ! ! ! } Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 12 May 2006 13:29:30 -0000 1.1 --- Makefile 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,628 **** ! # Makefile.in generated by automake 1.9.6 from Makefile.am. ! # src/Makefile. Generated from Makefile.in by configure. ! ! # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005 Free Software Foundation, Inc. ! # This Makefile.in is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. ! ! ! ! srcdir = . ! top_srcdir = .. ! ! pkgdatadir = $(datadir)/agg ! pkglibdir = $(libdir)/agg ! pkgincludedir = $(includedir)/agg ! top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ! INSTALL = /usr/bin/install -c ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) ! NORMAL_INSTALL = : ! PRE_INSTALL = : ! POST_INSTALL = : ! NORMAL_UNINSTALL = : ! PRE_UNINSTALL = : ! POST_UNINSTALL = : ! build_triplet = i686-pc-linux-gnu ! host_triplet = i686-pc-linux-gnu ! target_triplet = i686-pc-linux-gnu ! subdir = src ! DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog ! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ! am__aclocal_m4_deps = $(top_srcdir)/configure.in ! am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ! $(ACLOCAL_M4) ! mkinstalldirs = $(install_sh) -d ! CONFIG_HEADER = $(top_builddir)/include/config.h ! CONFIG_CLEAN_FILES = ! am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ! am__vpath_adj = case $$p in \ ! $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ! *) f=$$p;; \ ! esac; ! am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ! am__installdirs = "$(DESTDIR)$(libdir)" ! libLTLIBRARIES_INSTALL = $(INSTALL) ! LTLIBRARIES = $(lib_LTLIBRARIES) ! #am__DEPENDENCIES_1 = \ ! # $(top_builddir)/gpc/libagggpc.la ! am__DEPENDENCIES_2 = \ ! $(top_builddir)/src/ctrl/libaggctrl.la ! libagg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) ! am_libagg_la_OBJECTS = agg_arc.lo agg_arrowhead.lo agg_bezier_arc.lo \ ! agg_bspline.lo agg_curves.lo agg_embedded_raster_fonts.lo \ ! agg_gsv_text.lo agg_image_filters.lo agg_line_aa_basics.lo \ ! agg_line_profile_aa.lo agg_rounded_rect.lo agg_sqrt_tables.lo \ ! agg_trans_affine.lo agg_trans_double_path.lo \ ! agg_trans_single_path.lo agg_trans_warp_magnifier.lo \ ! agg_vcgen_bspline.lo agg_vcgen_contour.lo agg_vcgen_dash.lo \ ! agg_vcgen_markers_term.lo agg_vcgen_smooth_poly1.lo \ ! agg_vcgen_stroke.lo agg_vpgen_clip_polygon.lo \ ! agg_vpgen_clip_polyline.lo agg_vpgen_segmentator.lo ! libagg_la_OBJECTS = $(am_libagg_la_OBJECTS) ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include ! depcomp = ! am__depfiles_maybe = ! CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ! $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ! LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ ! $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ ! $(AM_CXXFLAGS) $(CXXFLAGS) ! CXXLD = $(CXX) ! CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ! $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! SOURCES = $(libagg_la_SOURCES) ! DIST_SOURCES = $(libagg_la_SOURCES) ! RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ! html-recursive info-recursive install-data-recursive \ ! install-exec-recursive install-info-recursive \ ! install-recursive installcheck-recursive installdirs-recursive \ ! pdf-recursive ps-recursive uninstall-info-recursive \ ! uninstall-recursive ! ETAGS = etags ! CTAGS = ctags ! DIST_SUBDIRS = $(SUBDIRS) ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! ACLOCAL = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run aclocal-1.9 ! AGG_LIB_VERSION = 2:4:0 ! AMDEP_FALSE = # ! AMDEP_TRUE = ! AMTAR = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run tar ! AR = ar ! AUTOCONF = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run autoconf ! AUTOHEADER = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run autoheader ! AUTOMAKE = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run automake-1.9 ! AWK = gawk ! CC = gcc ! CCDEPMODE = depmode=none ! CFLAGS = -g -O2 ! CPP = gcc -E ! CPPFLAGS = ! CXX = g++ ! CXXCPP = g++ -E ! CXXDEPMODE = depmode=none ! CXXFLAGS = -g -O2 ! CYGPATH_W = echo ! DEFS = -DHAVE_CONFIG_H ! DEPDIR = .deps ! ECHO = echo ! ECHO_C = ! ECHO_N = -n ! ECHO_T = ! EGREP = grep -E ! ENABLE_CTRL_FALSE = # ! ENABLE_CTRL_TRUE = ! ENABLE_EXAMPLES_FALSE = # ! ENABLE_EXAMPLES_TRUE = ! ENABLE_FT_FALSE = # ! ENABLE_FT_TRUE = ! ENABLE_GPC_FALSE = ! ENABLE_GPC_TRUE = # ! ENABLE_OSX_FALSE = ! ENABLE_OSX_TRUE = # ! ENABLE_SDL_FALSE = # ! ENABLE_SDL_TRUE = ! ENABLE_WIN32_FALSE = ! ENABLE_WIN32_TRUE = # ! ENABLE_WIN32_TT_FALSE = ! ENABLE_WIN32_TT_TRUE = # ! ENABLE_X11_FALSE = # ! ENABLE_X11_TRUE = ! EXEEXT = ! F77 = g77 ! FFLAGS = -g -O2 ! FREETYPE_CFLAGS = -I/usr/include/freetype2 ! FREETYPE_LIBS = -lfreetype -lz ! INSTALL_DATA = ${INSTALL} -m 644 ! INSTALL_PROGRAM = ${INSTALL} ! INSTALL_SCRIPT = ${INSTALL} ! INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s ! LDFLAGS = ! LIBOBJS = ! LIBS = ! LIBTOOL = $(SHELL) $(top_builddir)/libtool ! LN_S = ln -s ! LTLIBOBJS = ! MAKEINFO = ${SHELL} /home/ehud/Projects/agg-2.4/missing --run makeinfo ! OBJEXT = o ! OSX_CFLAGS = ! OSX_LIBS = ! PACKAGE = agg ! PACKAGE_BUGREPORT = ! PACKAGE_NAME = ! PACKAGE_STRING = ! PACKAGE_TARNAME = ! PACKAGE_VERSION = ! PATH_SEPARATOR = : ! PKG_CONFIG = /usr/bin/pkg-config ! PREFERED_PLATFORM = X11 ! RANLIB = ranlib ! SDL_CFLAGS = -I/usr/include/SDL -D_REENTRANT ! SDL_CONFIG = /usr/bin/sdl-config ! SDL_LIBS = -lSDL -lpthread ! SET_MAKE = ! SHELL = /bin/sh ! STRIP = strip ! U = ! VERSION = 2.4.0 ! WINDOWS_CFLAGS = ! WINDOWS_LIBS = ! ac_ct_AR = ar ! ac_ct_CC = gcc ! ac_ct_CXX = g++ ! ac_ct_F77 = g77 ! ac_ct_RANLIB = ranlib ! ac_ct_STRIP = strip ! ac_pt_PKG_CONFIG = /usr/bin/pkg-config ! am__fastdepCC_FALSE = ! am__fastdepCC_TRUE = # ! am__fastdepCXX_FALSE = ! am__fastdepCXX_TRUE = # ! am__include = include ! am__leading_dot = . ! am__quote = ! am__tar = ${AMTAR} chof - "$$tardir" ! am__untar = ${AMTAR} xf - ! bindir = ${exec_prefix}/bin ! build = i686-pc-linux-gnu ! build_alias = ! build_cpu = i686 ! build_os = linux-gnu ! build_vendor = pc ! datadir = ${prefix}/share ! exec_prefix = ${prefix} ! host = i686-pc-linux-gnu ! host_alias = ! host_cpu = i686 ! host_os = linux-gnu ! host_vendor = pc ! includedir = ${prefix}/include ! infodir = ${prefix}/info ! install_sh = /home/ehud/Projects/agg-2.4/install-sh ! libdir = ${exec_prefix}/lib ! libexecdir = ${exec_prefix}/libexec ! localstatedir = ${prefix}/var ! mandir = ${prefix}/man ! mkdir_p = mkdir -p -- ! oldincludedir = /usr/include ! prefix = /usr/local ! program_transform_name = s,x,x, ! sbindir = ${exec_prefix}/sbin ! sharedstatedir = ${prefix}/com ! sysconfdir = ${prefix}/etc ! target = i686-pc-linux-gnu ! target_alias = ! target_cpu = i686 ! target_os = linux-gnu ! target_vendor = pc ! x_includes = ! x_libraries = ! SUBDIRS = ctrl . platform ! INCLUDES = -I$(top_srcdir)/include ! lib_LTLIBRARIES = libagg.la ! libagg_la_LDFLAGS = -no-undefined -version-info 2:4:0 ! libagg_la_SOURCES = agg_arc.cpp \ ! agg_arrowhead.cpp \ ! agg_bezier_arc.cpp \ ! agg_bspline.cpp \ ! agg_curves.cpp \ ! agg_embedded_raster_fonts.cpp \ ! agg_gsv_text.cpp \ ! agg_image_filters.cpp \ ! agg_line_aa_basics.cpp \ ! agg_line_profile_aa.cpp \ ! agg_rounded_rect.cpp \ ! agg_sqrt_tables.cpp \ ! agg_trans_affine.cpp \ ! agg_trans_double_path.cpp \ ! agg_trans_single_path.cpp \ ! agg_trans_warp_magnifier.cpp \ ! agg_vcgen_bspline.cpp \ ! agg_vcgen_contour.cpp \ ! agg_vcgen_dash.cpp \ ! agg_vcgen_markers_term.cpp \ ! agg_vcgen_smooth_poly1.cpp \ ! agg_vcgen_stroke.cpp \ ! agg_vpgen_clip_polygon.cpp \ ! agg_vpgen_clip_polyline.cpp \ ! agg_vpgen_segmentator.cpp ! ! GPCLD = ! #GPCLD = $(top_builddir)/gpc/libagggpc.la ! #CTRLLD = ! CTRLLD = $(top_builddir)/src/ctrl/libaggctrl.la ! libagg_la_LIBADD = $(GPCLD) $(CTRLLD) ! all: all-recursive ! ! .SUFFIXES: ! .SUFFIXES: .cpp .lo .o .obj ! $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ! @for dep in $?; do \ ! case '$(am__configure_deps)' in \ ! *$$dep*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ! && exit 0; \ ! exit 1;; \ ! esac; \ ! done; \ ! echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign --ignore-deps src/Makefile'; \ ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --foreign --ignore-deps src/Makefile ! .PRECIOUS: Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! @case '$?' in \ ! *config.status*) \ ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ! *) \ ! echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ! esac; ! ! $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! ! $(top_srcdir)/configure: $(am__configure_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! $(ACLOCAL_M4): $(am__aclocal_m4_deps) ! cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ! install-libLTLIBRARIES: $(lib_LTLIBRARIES) ! @$(NORMAL_INSTALL) ! test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! if test -f $$p; then \ ! f=$(am__strip_dir) \ ! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ! else :; fi; \ ! done ! ! uninstall-libLTLIBRARIES: ! @$(NORMAL_UNINSTALL) ! @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! p=$(am__strip_dir) \ ! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ! done ! ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" != "$$p" || dir=.; \ ! echo "rm -f \"$${dir}/so_locations\""; \ ! rm -f "$${dir}/so_locations"; \ ! done ! libagg.la: $(libagg_la_OBJECTS) $(libagg_la_DEPENDENCIES) ! $(CXXLINK) -rpath $(libdir) $(libagg_la_LDFLAGS) $(libagg_la_OBJECTS) $(libagg_la_LIBADD) $(LIBS) ! ! mostlyclean-compile: ! -rm -f *.$(OBJEXT) ! ! distclean-compile: ! -rm -f *.tab.c ! ! .cpp.o: ! $(CXXCOMPILE) -c -o $@ $< ! ! .cpp.obj: ! $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ! ! .cpp.lo: ! $(LTCXXCOMPILE) -c -o $@ $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! ! # This directory's subdirectories are mostly independent; you can cd ! # into them and run `make' without going through this Makefile. ! # To change the values of `make' variables: instead of editing Makefiles, ! # (1) if the variable is set in `config.status', edit `config.status' ! # (which will cause the Makefiles to be regenerated when you run `make'); ! # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ ! dot_seen=no; \ ! target=`echo $@ | sed s/-recursive//`; \ ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! echo "Making $$target in $$subdir"; \ ! if test "$$subdir" = "."; then \ ! dot_seen=yes; \ ! local_target="$$target-am"; \ ! else \ ! local_target="$$target"; \ ! fi; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ ! done; \ ! if test "$$dot_seen" = "no"; then \ ! $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ ! fi; test -z "$$fail" ! ! mostlyclean-recursive clean-recursive distclean-recursive \ ! maintainer-clean-recursive: ! @failcom='exit 1'; \ ! for f in x $$MAKEFLAGS; do \ ! case $$f in \ ! *=* | --[!k]*);; \ ! *k*) failcom='fail=yes';; \ ! esac; \ ! done; \ ! dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ ! done; \ ! rev="$$rev ."; \ ! target=`echo $@ | sed s/-recursive//`; \ ! for subdir in $$rev; do \ ! echo "Making $$target in $$subdir"; \ ! if test "$$subdir" = "."; then \ ! local_target="$$target-am"; \ ! else \ ! local_target="$$target"; \ ! fi; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ! || eval $$failcom; \ ! done && test -z "$$fail" ! tags-recursive: ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ! done ! ctags-recursive: ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ! done ! ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! tags: TAGS ! ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ ! include_option=--etags-include; \ ! empty_fix=.; \ ! else \ ! include_option=--include; \ ! empty_fix=; \ ! fi; \ ! list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ ! test ! -f $$subdir/TAGS || \ ! tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ ! fi; \ ! done; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ! test -n "$$unique" || unique=$$empty_fix; \ ! $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique; \ ! fi ! ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here ! ! distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! ! distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkdir_p) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ ! if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ! else \ ! test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ ! fi; \ ! done ! list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ ! test -d "$(distdir)/$$subdir" \ ! || $(mkdir_p) "$(distdir)/$$subdir" \ ! || exit 1; \ ! distdir=`$(am__cd) $(distdir) && pwd`; \ ! top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$$top_distdir" \ ! distdir="$$distdir/$$subdir" \ ! distdir) \ ! || exit 1; \ ! fi; \ ! done ! check-am: all-am ! check: check-recursive ! all-am: Makefile $(LTLIBRARIES) ! installdirs: installdirs-recursive ! installdirs-am: ! for dir in "$(DESTDIR)$(libdir)"; do \ ! test -z "$$dir" || $(mkdir_p) "$$dir"; \ ! done ! install: install-recursive ! install-exec: install-exec-recursive ! install-data: install-data-recursive ! uninstall: uninstall-recursive ! ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! ! installcheck: installcheck-recursive ! install-strip: ! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ! install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ! `test -z '$(STRIP)' || \ ! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ! mostlyclean-generic: ! ! clean-generic: ! ! distclean-generic: ! -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ! ! maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! ! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ! mostlyclean-am ! ! distclean: distclean-recursive ! -rm -f Makefile ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! ! dvi: dvi-recursive ! ! dvi-am: ! ! html: html-recursive ! ! info: info-recursive ! ! info-am: ! ! install-data-am: ! ! install-exec-am: install-libLTLIBRARIES ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: ! ! maintainer-clean: maintainer-clean-recursive ! -rm -f Makefile ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! pdf: pdf-recursive ! pdf-am: - ps: ps-recursive ! ps-am: ! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES ! uninstall-info: uninstall-info-recursive ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ ! clean clean-generic clean-libLTLIBRARIES clean-libtool \ ! clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am html \ ! html-am info info-am install install-am install-data \ ! install-data-am install-exec install-exec-am install-info \ ! install-info-am install-libLTLIBRARIES install-man \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ ! uninstall-info-am uninstall-libLTLIBRARIES ! # Tell versions [3.59,3.63) of GNU make to not export all variables. ! # Otherwise a system limit (for SysV at least) may be exceeded. ! .NOEXPORT: --- 1,59 ---- ! include ../Makefile.in.$(shell uname) ! CXXFLAGS= $(AGGCXXFLAGS) -I../include -L./ ! SRC_CXX=\ ! agg_arc.cpp \ ! agg_arrowhead.cpp \ ! agg_bezier_arc.cpp \ ! agg_bspline.cpp \ ! agg_curves.cpp \ ! agg_vcgen_contour.cpp \ ! agg_vcgen_dash.cpp \ ! agg_vcgen_markers_term.cpp \ ! agg_vcgen_smooth_poly1.cpp \ ! agg_vcgen_stroke.cpp \ ! agg_vcgen_bspline.cpp \ ! agg_gsv_text.cpp \ ! agg_image_filters.cpp \ ! agg_line_aa_basics.cpp \ ! agg_line_profile_aa.cpp \ ! agg_rounded_rect.cpp \ ! agg_sqrt_tables.cpp \ ! agg_embedded_raster_fonts.cpp \ ! agg_trans_affine.cpp \ ! agg_trans_warp_magnifier.cpp \ ! agg_trans_single_path.cpp \ ! agg_trans_double_path.cpp \ ! agg_vpgen_clip_polygon.cpp \ ! agg_vpgen_clip_polyline.cpp \ ! agg_vpgen_segmentator.cpp \ ! ctrl/agg_cbox_ctrl.cpp \ ! ctrl/agg_gamma_ctrl.cpp \ ! ctrl/agg_gamma_spline.cpp \ ! ctrl/agg_rbox_ctrl.cpp \ ! ctrl/agg_slider_ctrl.cpp \ ! ctrl/agg_spline_ctrl.cpp \ ! ctrl/agg_scale_ctrl.cpp \ ! ctrl/agg_polygon_ctrl.cpp \ ! ctrl/agg_bezier_ctrl.cpp ! SRC_C=\ ! ../gpc/gpc.c ! OBJ=$(SRC_CXX:.cpp=.o) $(SRC_C:.c=.o) ! all: $(OBJ) ! $(LIB) libagg.a $(OBJ) ! clean: ! rm -f *.o *.a ctrl/*.o ../gpc/*.o ! rm -rf SunWS_cache ! rm -rf ctrl/SunWS_cache ! %.o: %.cpp ! $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ ! %.o: %.c ! $(C) -c $(CXXFLAGS) $*.c -o $@ Index: agg_sqrt_tables.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/agg_sqrt_tables.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_sqrt_tables.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_sqrt_tables.cpp 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,115 **** ! //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- ! // Contact: mc...@an... ! // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // static tables for fast integer sqrt ! // ! //---------------------------------------------------------------------------- ! ! #include "agg_basics.h" ! ! namespace agg ! { ! int16u g_sqrt_table[1024] = ! { ! 0, ! 2048,2896,3547,4096,4579,5017,5418,5793,6144,6476,6792,7094,7384,7663,7932,8192,8444, ! 8689,8927,9159,9385,9606,9822,10033,10240,10443,10642,10837,11029,11217,11403,11585, ! 11765,11942,12116,12288,12457,12625,12790,12953,13114,13273,13430,13585,13738,13890, ! 14040,14189,14336,14482,14626,14768,14910,15050,15188,15326,15462,15597,15731,15864, ! 15995,16126,16255,16384,16512,16638,16764,16888,17012,17135,17257,17378,17498,17618, ! 17736,17854,17971,18087,18203,18318,18432,18545,18658,18770,18882,18992,19102,19212, ! 19321,19429,19537,19644,19750,19856,19961,20066,20170,20274,20377,20480,20582,20684, ! 20785,20886,20986,21085,21185,21283,21382,21480,21577,21674,21771,21867,21962,22058, ! 22153,22247,22341,22435,22528,22621,22713,22806,22897,22989,23080,23170,23261,23351, ! 23440,23530,23619,23707,23796,23884,23971,24059,24146,24232,24319,24405,24491,24576, ! 24661,24746,24831,24915,24999,25083,25166,25249,25332,25415,25497,25580,25661,25743, ! 25824,25905,25986,26067,26147,26227,26307,26387,26466,26545,26624,26703,26781,26859, ! 26937,27015,27092,27170,27247,27324,27400,27477,27553,27629,27705,27780,27856,27931, ! 28006,28081,28155,28230,28304,28378,28452,28525,28599,28672,28745,28818,28891,28963, ! 29035,29108,29180,29251,29323,29394,29466,29537,29608,29678,29749,29819,29890,29960, ! 30030,30099,30169,30238,30308,30377,30446,30515,30583,30652,30720,30788,30856,30924, ! 30992,31059,31127,31194,31261,31328,31395,31462,31529,31595,31661,31727,31794,31859, ! 31925,31991,32056,32122,32187,32252,32317,32382,32446,32511,32575,32640,32704,32768, ! 32832,32896,32959,33023,33086,33150,33213,33276,33339,33402,33465,33527,33590,33652, ! 33714,33776,33839,33900,33962,34024,34086,34147,34208,34270,34331,34392,34453,34514, ! 34574,34635,34695,34756,34816,34876,34936,34996,35056,35116,35176,35235,35295,35354, ! 35413,35472,35531,35590,35649,35708,35767,35825,35884,35942,36001,36059,36117,36175, ! 36233,36291,36348,36406,36464,36521,36578,36636,36693,36750,36807,36864,36921,36978, ! 37034,37091,37147,37204,37260,37316,37372,37429,37485,37540,37596,37652,37708,37763, ! 37819,37874,37929,37985,38040,38095,38150,38205,38260,38315,38369,38424,38478,38533, ! 38587,38642,38696,38750,38804,38858,38912,38966,39020,39073,39127,39181,39234,39287, ! 39341,39394,39447,39500,39553,39606,39659,39712,39765,39818,39870,39923,39975,40028, ! 40080,40132,40185,40237,40289,40341,40393,40445,40497,40548,40600,40652,40703,40755, ! 40806,40857,40909,40960,41011,41062,41113,41164,41215,41266,41317,41368,41418,41469, ! 41519,41570,41620,41671,41721,41771,41821,41871,41922,41972,42021,42071,42121,42171, ! 42221,42270,42320,42369,42419,42468,42518,42567,42616,42665,42714,42763,42813,42861, ! 42910,42959,43008,43057,43105,43154,43203,43251,43300,43348,43396,43445,43493,43541, ! 43589,43637,43685,43733,43781,43829,43877,43925,43972,44020,44068,44115,44163,44210, ! 44258,44305,44352,44400,44447,44494,44541,44588,44635,44682,44729,44776,44823,44869, ! 44916,44963,45009,45056,45103,45149,45195,45242,45288,45334,45381,45427,45473,45519, ! 45565,45611,45657,45703,45749,45795,45840,45886,45932,45977,46023,46069,46114,46160, ! 46205,46250,46296,46341,46386,46431,46477,46522,46567,46612,46657,46702,46746,46791, ! 46836,46881,46926,46970,47015,47059,47104,47149,47193,47237,47282,47326,47370,47415, ! 47459,47503,47547,47591,47635,47679,47723,47767,47811,47855,47899,47942,47986,48030, ! 48074,48117,48161,48204,48248,48291... [truncated message content] |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:35
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/src/ctrl Modified Files: agg_bezier_ctrl.cpp agg_cbox_ctrl.cpp agg_gamma_ctrl.cpp agg_gamma_spline.cpp agg_polygon_ctrl.cpp agg_rbox_ctrl.cpp agg_scale_ctrl.cpp agg_slider_ctrl.cpp agg_spline_ctrl.cpp Log Message: Update to agg 2.5 Index: agg_bezier_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_bezier_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_bezier_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_bezier_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes bezier_ctrl_impl, bezier_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_rbox_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_rbox_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_rbox_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_rbox_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes rbox_ctrl_impl, rbox_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_gamma_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_gamma_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_gamma_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_gamma_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class gamma_ctrl_impl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_cbox_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_cbox_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_cbox_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_cbox_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes rbox_ctrl_impl, rbox_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_polygon_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_polygon_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_polygon_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_polygon_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes polygon_ctrl_impl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- *************** *** 34,38 **** m_status(0), m_dx(0.0), ! m_dy(0.0) { m_stroke.width(1.0); --- 39,44 ---- m_status(0), m_dx(0.0), ! m_dy(0.0), ! m_in_polygon_check(true) { m_stroke.width(1.0); Index: agg_gamma_spline.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_gamma_spline.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_gamma_spline.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_gamma_spline.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class gamma_spline ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_spline_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_spline_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_spline_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_spline_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes spline_ctrl_impl, spline_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_slider_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_slider_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_slider_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_slider_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes slider_ctrl_impl, slider_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_scale_ctrl.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/ctrl/agg_scale_ctrl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_scale_ctrl.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_scale_ctrl.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes scale_ctrl_impl, scale_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:34
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/src/platform/win32 Modified Files: agg_platform_support.cpp agg_win32_bmp.cpp Log Message: Update to agg 2.5 Index: agg_platform_support.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/win32/agg_platform_support.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_platform_support.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_platform_support.cpp 7 Jan 2007 09:54:31 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class platform_support ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_win32_bmp.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/win32/agg_win32_bmp.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_win32_bmp.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_win32_bmp.cpp 7 Jan 2007 09:54:31 -0000 1.2 *************** *** 299,303 **** if(dvc_width != bmp_width || dvc_height != bmp_height) { ! //::SetStretchBltMode(h_dc, COLORONCOLOR); ::StretchDIBits( h_dc, // handle of device context --- 299,303 ---- if(dvc_width != bmp_width || dvc_height != bmp_height) { ! // ::SetStretchBltMode(h_dc, COLORONCOLOR); ::StretchDIBits( h_dc, // handle of device context |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:34
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/X11 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/src/platform/X11 Modified Files: agg_platform_support.cpp Log Message: Update to agg 2.5 Index: agg_platform_support.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/X11/agg_platform_support.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_platform_support.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_platform_support.cpp 7 Jan 2007 09:54:30 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class platform_support. X11 version. ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:34
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/sdl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/src/platform/sdl Modified Files: agg_platform_support.cpp Log Message: Update to agg 2.5 Index: agg_platform_support.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/src/platform/sdl/agg_platform_support.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_platform_support.cpp 12 May 2006 13:29:30 -0000 1.1 --- agg_platform_support.cpp 7 Jan 2007 09:54:31 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class platform_support. SDL version. ! // //---------------------------------------------------------------------------- --- 1,25 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev ! // Copyright (C) 2004 Mauricio Piacentini (SDL Support) // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:33
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/include/platform/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/include/platform/win32 Modified Files: agg_win32_bmp.h Log Message: Update to agg 2.5 Index: agg_win32_bmp.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/platform/win32/agg_win32_bmp.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_win32_bmp.h 12 May 2006 13:29:30 -0000 1.1 --- agg_win32_bmp.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,20 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class pixel_map ! // //---------------------------------------------------------------------------- #ifndef AGG_WIN32_BMP_INCLUDED #define AGG_WIN32_BMP_INCLUDED --- 1,26 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- + #ifndef AGG_WIN32_BMP_INCLUDED #define AGG_WIN32_BMP_INCLUDED |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:33
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/include/platform In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/include/platform Modified Files: agg_platform_support.h Log Message: Update to agg 2.5 Index: agg_platform_support.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/platform/agg_platform_support.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_platform_support.h 12 May 2006 13:29:30 -0000 1.1 --- agg_platform_support.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,15 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com //---------------------------------------------------------------------------- // --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- // |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:33
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/include/ctrl Modified Files: agg_bezier_ctrl.h agg_cbox_ctrl.h agg_ctrl.h agg_gamma_ctrl.h agg_gamma_spline.h agg_polygon_ctrl.h agg_rbox_ctrl.h agg_scale_ctrl.h agg_slider_ctrl.h agg_spline_ctrl.h Log Message: Update to agg 2.5 Index: agg_slider_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_slider_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_slider_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_slider_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes slider_ctrl_impl, slider_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // Function render_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_gamma_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_gamma_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_gamma_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_gamma_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class gamma_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_spline_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_spline_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_spline_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_spline_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes spline_ctrl_impl, spline_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_bezier_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_bezier_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_bezier_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_bezier_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes bezier_ctrl_impl, bezier_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_rbox_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_rbox_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_rbox_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_rbox_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes rbox_ctrl_impl, rbox_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_polygon_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_polygon_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_polygon_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_polygon_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes polygon_ctrl_impl, polygon_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_gamma_spline.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_gamma_spline.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_gamma_spline.h 12 May 2006 13:29:30 -0000 1.1 --- agg_gamma_spline.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // class gamma_spline ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_cbox_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_cbox_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_cbox_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_cbox_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes cbox_ctrl_impl, cbox_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_scale_ctrl.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/ctrl/agg_scale_ctrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_scale_ctrl.h 12 May 2006 13:29:30 -0000 1.1 --- agg_scale_ctrl.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // classes scale_ctrl_impl, scale_ctrl ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:54:32
|
Update of /cvsroot/roadmap/roadmap_editor/src/agg/include/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31745/include/util Modified Files: agg_color_conv.h agg_color_conv_rgb16.h agg_color_conv_rgb8.h Log Message: Update to agg 2.5 Index: agg_color_conv_rgb16.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/util/agg_color_conv_rgb16.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_color_conv_rgb16.h 12 May 2006 13:29:30 -0000 1.1 --- agg_color_conv_rgb16.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,15 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com //---------------------------------------------------------------------------- // --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- // Index: agg_color_conv.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/util/agg_color_conv.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_color_conv.h 12 May 2006 13:29:30 -0000 1.1 --- agg_color_conv.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,19 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com ! //---------------------------------------------------------------------------- ! // ! // Conversion from one colorspace/pixel format to another ! // //---------------------------------------------------------------------------- --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- Index: agg_color_conv_rgb8.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/agg/include/util/agg_color_conv_rgb8.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** agg_color_conv_rgb8.h 12 May 2006 13:29:30 -0000 1.1 --- agg_color_conv_rgb8.h 7 Jan 2007 09:54:29 -0000 1.2 *************** *** 1,15 **** //---------------------------------------------------------------------------- ! // Anti-Grain Geometry - Version 2.4 ! // Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com) ! // ! // Permission to copy, use, modify, sell and distribute this software ! // is granted provided this copyright notice appears in all copies. ! // This software is provided "as is" without express or implied ! // warranty, and with no claim as to its suitability for any purpose. ! // ! //---------------------------------------------------------------------------- // Contact: mc...@an... // mcs...@ya... ! // http://www.antigrain.com //---------------------------------------------------------------------------- // --- 1,24 ---- //---------------------------------------------------------------------------- ! // Anti-Grain Geometry (AGG) - Version 2.5 ! // A high quality rendering engine for C++ ! // Copyright (C) 2002-2006 Maxim Shemanarev // Contact: mc...@an... // mcs...@ya... ! // http://antigrain.com ! // ! // AGG is free software; you can redistribute it and/or ! // modify it under the terms of the GNU General Public License ! // as published by the Free Software Foundation; either version 2 ! // of the License, or (at your option) any later version. ! // ! // AGG is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with AGG; if not, write to the Free Software ! // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ! // MA 02110-1301, USA. //---------------------------------------------------------------------------- // |
Update of /cvsroot/roadmap/roadmap_editor/src/skins/default In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27909/default Added Files: about.png addeditnote.png address.png button_down.png button_up.png deleteroads.png detectreceiver.png down.png draw_roads.png edit.png key1_large_down.png key1_large_up.png key1_medium_down.png key1_medium_up.png key2_large_down.png key2_large_up.png key2_medium_down.png key2_medium_up.png left.png nav_approaching.png nav_continue.png nav_exit_left.png nav_exit_right.png nav_keep_left.png nav_keep_right.png nav_panel.png nav_panel_wide.png nav_turn_left.png nav_turn_right.png nav_u_turn.png objects objects_wide preferences.png properties.png right.png rm_2d.png rm_3d.png rm_clockwise.png rm_counterclockwise.png rm_destination.png rm_down.png rm_full.png rm_gps.png rm_hold.png rm_left.png rm_location.png rm_menu.png rm_new_roads.png rm_quit.png rm_record.png rm_right.png rm_stop.png rm_up.png rm_zoom1.png rm_zoomin.png rm_zoomout.png schema_day schema_night setasdeparture.png setasdestination.png sync.bmp sync.png traffic.png u_turn.png up.png updaterange.png viewmarkers.png welcome.png Log Message: Add day and night skins. --- NEW FILE: button_down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sync.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: schema_night --- Map.Background: #3E3F78 Labels.Color: white Console.Foreground: navy Streets.Streets1: 0 Highways.Highways1: 0 Ramps.Ramps1: 0 Freeways.Freeways2: 0 Freeways.Freeways2: 0 Ramps.Ramps1: 0 Highways.Highways1: 0 Streets.Streets1: 0 Trails.Delta1: 0 Parks.Delta1: 0 Hospitals.Delta1: 0 Airports.Delta1: 0 Stations.Delta1: 0 Malls.Delta1: 0 Shore.Delta1: 0 Rivers.Delta1: 0 Lakes.Delta1: 0 Sea.Delta1: 0 Sea.Thickness: 1 Sea.Declutter: 2147483647 Sea.Color: SlateBlue Sea.Class: Area Parks.Thickness: 1 Parks.Declutter: 4096 Parks.Color: #afcf94 Parks.Class: Area Lakes.Thickness: 1 Lakes.Declutter: 1300 Lakes.Color: #9cb2ce Lakes.Class: Area Stations.Thickness: 1 Stations.Declutter: 4096 Stations.Color: grey Stations.Class: Area Airports.Thickness: 1 Airports.Declutter: 4096 Airports.Color: grey Airports.Class: Area Malls.Thickness: 1 Malls.Declutter: 4096 Malls.Color: yellow Malls.Class: Area Hospitals.Thickness: 1 Hospitals.Declutter: 4096 Hospitals.Color: red Hospitals.Class: Area Shore.Thickness: 2 Shore.Declutter: 2147483647 Shore.Color: LightSlateBlue Shore.Class: Feature Rivers.Thickness: 3 Rivers.Declutter: 300 Rivers.Color: #9cb2ce Rivers.Class: Feature Trails.Thickness: 1 Trails.Declutter: 160 Trails.Color: #a5968d Trails.Class: Road Streets.Thickness: 2 Streets.Declutter: 160 Streets.Delta1: -2 Streets.Color1: #c0ccda Streets.Color: #a0a0a0 Streets.Class: Road Highways.Thickness: 3 Highways.Declutter: 1300 Highways.Delta1: -2 Highways.Color1: #e9900c Highways.Color: #b0b0b0 Highways.Class: Road Ramps.Thickness: 3 Ramps.Declutter: 160 Ramps.Delta1: -2 Ramps.Color1: #3ea903 Ramps.Color: #ad8e21 Ramps.Class: Road Freeways.Thickness: 4 Freeways.Declutter: 2147483647 Freeways.Delta2: 1 Freeways.Color2: #000000 Freeways.Delta1: -2 Freeways.Color1: #dd4fff Freeways.Color: #ad8e21 Freeways.Class: Road --- NEW FILE: rm_location.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_hold.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_turn_right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: address.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key1_medium_up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_exit_left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: setasdestination.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: viewmarkers.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: addeditnote.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_clockwise.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key1_large_down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_panel.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_destination.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_exit_right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key2_medium_up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_new_roads.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: objects_wide --- N Compass E Compass E Compass_fixed P 20 20 S orientation_mode B -20 -16 20 16 A toggleorientation N zoom1_button I rm_zoom1 P -61 -115 O 160 A zoom1 B -4 -4 28 28 S zoom_reset N zoomin_button I rm_zoomin P -61 -80 O 160 A zoomin B -4 -4 28 28 N zoomout_button I rm_zoomout P -26 -80 O 160 A zoomout B -4 -4 28 28 N gps_button I rm_gps P -61 -45 O 160 A gps B -4 -4 28 28 S GPS_focus N quit_button I rm_quit P -20 -167 A quit B -4 -4 20 20 N full_screen I rm_full P -20 -115 A full B -4 -4 20 20 N view_button I rm_3d I rm_2d P -26 -45 O 160 A toggleview toggleskin B -4 -4 28 28 S view_mode N gps_reception E Reception_na E Reception_none E Reception_poor E Reception_good P 19 56 S GPS_reception R N menu_button I rm_menu P 1 77 O 160 A quickmenu B -4 -4 28 28 N new_roads I rm_new_roads X I rm_new_roads A togglenewroads S new_roads P -96 -45 O 200 B -4 -4 28 28 R --- NEW FILE: button_up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: u_turn.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_approaching.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key2_medium_down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_counterclockwise.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_full.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_turn_left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: welcome.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_keep_left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_2d.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_menu.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: preferences.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_3d.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key1_large_up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: about.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_zoom1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_zoomin.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key2_large_up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: deleteroads.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_up.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_panel_wide.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: edit.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_continue.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: properties.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_keep_right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: setasdeparture.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: draw_roads.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_gps.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_stop.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key1_medium_down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: detectreceiver.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_zoomout.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: schema_day --- Map.Background: #ffffcc Labels.Color: black Console.Foreground: black Airports.Class: Area Airports.Color: grey Airports.Declutter: 4096 Airports.Delta1: 0 Airports.Thickness: 1 Freeways.Class: Road Freeways.Color: #000000 Freeways.Color1: #C63094 Freeways.Declutter: 2147483647 Freeways.Delta1: -2 Freeways.Freeways1: 0 Freeways.Freeways1: 0 Freeways.Freeways2: 0 Freeways.Thickness: 4 Highways.Class: Road Highways.Color: #000000 Highways.Color1: #FDBF6F Highways.Declutter: 1300 Highways.Delta1: -2 Highways.Highways1: 0 Highways.Highways1: 0 Highways.Thickness: 3 Hospitals.Class: Area Hospitals.Color: red Hospitals.Declutter: 4096 Hospitals.Delta1: 0 Hospitals.Thickness: 1 Lakes.Class: Area Lakes.Color: LightBlue Lakes.Declutter: 1300 Lakes.Delta1: 0 Lakes.Thickness: 1 Malls.Class: Area Malls.Color: yellow Malls.Declutter: 4096 Malls.Delta1: 0 Malls.Thickness: 1 Parks.Class: Area Parks.Color: green Parks.Declutter: 4096 Parks.Delta1: 0 Parks.Thickness: 1 Ramps.Class: Road Ramps.Color: #000000 Ramps.Color1: #1e7546 Ramps.Declutter: 160 Ramps.Delta1: -2 Ramps.Ramps1: 0 Ramps.Ramps1: 0 Ramps.Thickness: 3 Rivers.Class: Feature Rivers.Color: LightBlue Rivers.Declutter: 300 Rivers.Delta1: 0 Rivers.Thickness: 3 Sea.Class: Area Sea.Color: SlateBlue Sea.Declutter: 2147483647 Sea.Delta1: 0 Sea.Thickness: 1 Shore.Class: Feature Shore.Color: LightSlateBlue Shore.Declutter: 2147483647 Shore.Delta1: 0 Shore.Thickness: 2 Stations.Class: Area Stations.Color: grey Stations.Declutter: 4096 Stations.Delta1: 0 Stations.Thickness: 1 Streets.Class: Road Streets.Color: #000000 Streets.Color1: white Streets.Declutter: 160 Streets.Delta1: -2 Streets.Streets1: 0 Streets.Streets1: 0 Streets.Thickness: 2 Trails.Class: Road Trails.Color: DarkGrey Trails.Declutter: 160 Trails.Delta1: 0 Trails.Thickness: 1 --- NEW FILE: updaterange.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_right.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: objects --- N Compass E Compass E Compass_fixed P 20 20 S orientation_mode B -20 -16 20 16 A toggleorientation N zoom1_button I rm_zoom1 P -26 -135 O 160 A zoom1 B -4 -4 28 28 S zoom_reset N zoomin_button I rm_zoomin P -26 -100 O 160 A zoomin B -4 -4 28 28 N zoomout_button I rm_zoomout P -26 -65 O 160 A zoomout B -4 -4 28 28 N gps_button I rm_gps P -26 -30 O 160 A gps B -4 -4 28 28 S GPS_focus N quit_button I rm_quit P -20 1 A quit B -4 -4 20 20 N full_screen I rm_full P -20 25 A full B -4 -4 20 20 N view_button I rm_3d I rm_2d P 1 -30 O 160 A toggleview toggleskin B -4 -4 28 28 S view_mode N gps_reception E Reception_na E Reception_none E Reception_poor E Reception_good P 19 60 S GPS_reception R N menu_button I rm_menu P 1 100 O 160 A quickmenu B -4 -4 28 28 N new_roads I rm_new_roads X I rm_new_roads A togglenewroads S new_roads P -60 -30 O 200 B -4 -4 28 28 R --- NEW FILE: sync.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_quit.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: key2_large_down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_u_turn.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: traffic.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_down.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_record.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:43:13
|
Update of /cvsroot/roadmap/roadmap_editor/src/skins/default In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27466/default Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/skins/default added to the repository |
|
From: Ehud S. <esh...@us...> - 2007-01-07 09:42:55
|
Update of /cvsroot/roadmap/roadmap_editor/src/skins In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27123/skins Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/skins added to the repository |
|
From: Paul F. <pg...@us...> - 2006-12-28 23:36:40
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27068 Modified Files: rdmcompare rdmdownload rdmgendcwmaps rdmgenmaps rdmgenshpmaps Log Message: improve usage messages Index: rdmdownload =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmdownload,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** rdmdownload 29 Nov 2006 23:55:20 -0000 1.5 --- rdmdownload 28 Dec 2006 22:22:36 -0000 1.6 *************** *** 3,23 **** # This script download the most recent version of the complete set of # TIGER files from the US Census Bureau's web site. ! # ! # USAGE: ! # ------ ! # ! # rdmdownload <destination-path> [format=2004|2005] [<state> ..] ! # ! # Example: rdmdownload /var/tmp/maps CA ! # ! # PLEASE NOTE THE TIGER FILES ARE HUGE: THIS DOWNLOAD IS LIKELY ! # TO TAKE A VERY LONG TIME TO COMPLETE AND THE TIGER FILES WILL ! # USE A AWFUL LOT OF SPACE ON YOUR LOCAL HARD DRIVE. ! # ! # Now you know... TIGERDIR=$1 shift TIGERURL=http://www2.census.gov/geo/tiger/tiger2005se TIGEROPT1="-nd -np -r -N -P $TIGERDIR -A.zip" --- 3,30 ---- # This script download the most recent version of the complete set of # TIGER files from the US Census Bureau's web site. ! ! usage() ! { ! cat >&2 <<EOF ! usage: rdmdownload <tiger-destination-path> [format=2004|2005] [<state> ..] ! ! All 2005 tiger maps will be downloaded to the specified directory, ! or, optionally, just for the specified states. ! ! Example: rdmdownload /var/tmp/maps CA ! ! Please note the tiger files are HUGE: this download is likely ! to take a very long time to complete and the tiger files will ! use an awful lot of space on your local hard drive. ! EOF ! exit 1 ! } TIGERDIR=$1 + test -d "$TIGERDIR" || usage + shift + TIGERURL=http://www2.census.gov/geo/tiger/tiger2005se TIGEROPT1="-nd -np -r -N -P $TIGERDIR -A.zip" Index: rdmcompare =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmcompare,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rdmcompare 6 Feb 2006 03:49:06 -0000 1.2 --- rdmcompare 28 Dec 2006 22:22:36 -0000 1.3 *************** *** 5,13 **** # translation failed). # ! # USAGE: ! # ------ ! # ! # rdmcompare <tiger-path> [maps=<map-directory-path>] ! # MAPSDIR=/usr/local/share/roadmap --- 5,16 ---- # translation failed). # ! ! usage() ! { ! echo "usage: rdmcompare <tiger-path> [maps=<map-directory-path>]" >&2 ! echo " Used to check the translation of tiger data." >&2 ! exit 1 ! } ! MAPSDIR=/usr/local/share/roadmap *************** *** 15,18 **** --- 18,22 ---- STARTDIR=`pwd` TIGERDIR=$1 + test -d "$TIGERDIR" || usage shift *************** *** 24,28 **** ! function check_one_county { base=`basename $1` --- 28,32 ---- ! check_one_county() { base=`basename $1` Index: rdmgendcwmaps =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmgendcwmaps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rdmgendcwmaps 10 Aug 2006 14:04:03 -0000 1.2 --- rdmgendcwmaps 28 Dec 2006 22:22:36 -0000 1.3 *************** *** 11,20 **** # maps=/usr/local/share/roadmap prov='*' if [ $# -eq 0 ] ; then ! echo 'Usage: rdmgendcwmaps [maps=<map-directory-path>] [test] [dryrun] [<files> ...]' ! exit 1 fi --- 11,25 ---- # + usage() + { + echo 'Usage: rdmgendcwmaps [maps=<map-directory-path>] [test] [dryrun] [<files> ...]' >&2 + exit 1 + } + maps=/usr/local/share/roadmap prov='*' if [ $# -eq 0 ] ; then ! usage fi Index: rdmgenmaps =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmgenmaps,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** rdmgenmaps 29 Nov 2006 23:54:13 -0000 1.11 --- rdmgenmaps 28 Dec 2006 22:22:36 -0000 1.12 *************** *** 6,27 **** # files in uncompressed form, waisting large amounts of disk space. # - # USAGE: - # ------ - # - # rdmgenmaps <tiger-path> [maps=<map-directory-path>] - # [format=2000|2002|2004|2005] - # [state=<state-id>] - # [verbose|test] - # - # or - # - # rdmgenmaps <tiger-path> [maps=<map-directory-path>] - # [format=2000|2002|2004|2005] - # [verbose|test] - # county-fips ... - # - # Example: rdmgenmaps /var/lib/roadmap state=06 - # - # # The buildmap and buildus programs will be found either in the # current directory, or via $PATH. Pass in $BUILDMAP and/or --- 6,9 ---- *************** *** 29,32 **** --- 11,35 ---- # # + + usage() + { + cat >&2 <<EOF + rdmgenmaps <tiger-path> [maps=<map-directory-path>] + [format=2000|2002|2004|2005] + [state=<state-id>] + [verbose|test] + + or + + rdmgenmaps <tiger-path> [maps=<map-directory-path>] + [format=2000|2002|2004|2005] + [verbose|test] + county-fips ... + + Example: rdmgenmaps /var/lib/roadmap state=06 + EOF + exit 1 + } + # Default setup: preferred map path is used, latest format, all states. *************** *** 41,44 **** --- 44,48 ---- TIGERDIR=$1 + test -d "$TIGERDIR" || usage shift *************** *** 98,102 **** fi ! function process_one_county { if [ -e $TIGERDIR/TGR$1.ZIP ] ; then --- 102,106 ---- fi ! process_one_county() { if [ -e $TIGERDIR/TGR$1.ZIP ] ; then *************** *** 153,159 **** then if [ -e buildus ] ; then ! BUILDUS=./buildus else ! BUILDUS=buildus fi fi --- 157,163 ---- then if [ -e buildus ] ; then ! BUILDUS=./buildus else ! BUILDUS=buildus fi fi Index: rdmgenshpmaps =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/rdmgenshpmaps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rdmgenshpmaps 10 Aug 2006 14:04:03 -0000 1.2 --- rdmgenshpmaps 28 Dec 2006 22:22:36 -0000 1.3 *************** *** 6,15 **** # either DMTI or RNF format, and process them through buildmap. # ! # Usage: ! # ! # rdmgenshpmaps <shapefile path> [maps=<map-directory-path>] ! # [test] ! # [dmti] ! # [<province-abbrev> ...] --- 6,20 ---- # either DMTI or RNF format, and process them through buildmap. # ! ! usage() ! { ! cat >&2 <<EOF ! rdmgenshpmaps <shapefile path> [maps=<map-directory-path>] ! [test] ! [dmti] ! [<province-abbrev> ...] ! EOF ! exit 1 ! } *************** *** 22,27 **** if [ $# -eq 0 ] ; then ! echo 'Usage: rdmgenshpmaps <shapefile path> [maps=<map-directory-path>] [test] [dryrun] [dmti] [<province-abbrev> ...]' ! exit 1 fi --- 27,31 ---- if [ $# -eq 0 ] ; then ! usage fi *************** *** 77,81 **** # 87 88 89 90 91 92 93 94 95 96 97 98 99 ! function get_fips { # handle either RNF or DMTI naming convention f=`basename $1` --- 81,85 ---- # 87 88 89 90 91 92 93 94 95 96 97 98 99 ! get_fips() { # handle either RNF or DMTI naming convention f=`basename $1` |
|
From: Paul F. <pg...@us...> - 2006-12-04 15:18:15
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21045 Modified Files: buildmap_tiger.c Log Message: add support for railroad display Index: buildmap_tiger.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_tiger.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** buildmap_tiger.c 12 Oct 2006 20:58:38 -0000 1.15 --- buildmap_tiger.c 4 Dec 2006 15:17:14 -0000 1.16 *************** *** 78,81 **** --- 78,82 ---- static int BuildMapLayerStreet = 0; static int BuildMapLayerTrail = 0; + static int BuildMapLayerRail = 0; /* Area layers. */ *************** *** 125,128 **** --- 126,130 ---- buildmap_tiger_set_one_layer (verbose, &BuildMapLayerStreet, "streets"); buildmap_tiger_set_one_layer (verbose, &BuildMapLayerTrail, "trails"); + buildmap_tiger_set_one_layer (verbose, &BuildMapLayerRail, "railroads"); buildmap_tiger_set_one_layer (verbose, &BuildMapLayerParc, "parks"); *************** *** 295,298 **** --- 297,312 ---- break; + case 'B': /* Railroads. */ + + if ((line[start] == '4') || /* rail on ferry */ + (line[start] == '1' && + (line[start+1] == '4' || /* various abandoned */ + line[start+1] == '5' || + line[start+1] == '6'))) { + break; + } + + return BuildMapLayerRail; + case 'H': /* Rivers, lakes and sea. */ |
|
From: Paul F. <pg...@us...> - 2006-12-04 15:18:05
|
Update of /cvsroot/roadmap/roadmap/src/default In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21045/default Modified Files: All Log Message: add support for railroad display Index: All =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/default/All,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** All 6 Feb 2006 06:46:11 -0000 1.2 --- All 4 Dec 2006 15:17:14 -0000 1.3 *************** *** 1,4 **** Class.Name: All ! Class.Lines: Freeways Ramps Highways Streets Trails Rivers Shore Class.Polygons: Lakes Sea Parks Hospitals Airports Stations Malls Navigation.Car: Freeways Ramps Highways Streets Trails --- 1,4 ---- Class.Name: All ! Class.Lines: Freeways Ramps Highways Streets Trails Rivers Shore Railroads Class.Polygons: Lakes Sea Parks Hospitals Airports Stations Malls Navigation.Car: Freeways Ramps Highways Streets Trails *************** *** 28,31 **** --- 28,35 ---- Trails.Declutter: 160 Trails.Thickness: 1 + Railroads.Color: black + Railroads.Declutter: 250 + Railroads.Style: dashed + Railroads.Thickness: 1 Rivers.Color: LightBlue Rivers.Declutter: 300 |
|
From: Paul F. <pg...@us...> - 2006-12-01 20:37:15
|
Update of /cvsroot/roadmap/roadmap/src/qt In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9912/qt Modified Files: qt_canvas.cc qt_canvas.h roadmap_canvas.cc Log Message: allow setting line style to "dashed". this implements it everywhere except agg. also, prevent calls in roadmap_layer.c that try to set thickness to 0. Index: roadmap_canvas.cc =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_canvas.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** roadmap_canvas.cc 3 Nov 2006 14:42:15 -0000 1.11 --- roadmap_canvas.cc 1 Dec 2006 16:15:15 -0000 1.12 *************** *** 107,110 **** --- 107,114 ---- } + void roadmap_canvas_set_linestyle (const char *style) { + roadMapCanvas->setPenLineStyle(style); + } + void roadmap_canvas_set_thickness (int thickness) { roadMapCanvas->setPenThickness(thickness); Index: qt_canvas.cc =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_canvas.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** qt_canvas.cc 19 Nov 2006 21:24:19 -0000 1.15 --- qt_canvas.cc 1 Dec 2006 16:15:15 -0000 1.16 *************** *** 90,93 **** --- 90,104 ---- } + void RMapCanvas::setPenLineStyle(const char* style) { + if (currentPen != 0) { + if (strcasecmp (style, "dashed") == 0) { + currentPen->setStyle(Qt::DashLine); + } else { + currentPen->setStyle(Qt::SolidLine); + } + } + + } + void RMapCanvas::setPenThickness(int thickness) { if (currentPen != 0) { Index: qt_canvas.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/qt/qt_canvas.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** qt_canvas.h 3 Nov 2006 14:42:15 -0000 1.8 --- qt_canvas.h 1 Dec 2006 16:15:15 -0000 1.9 *************** *** 55,58 **** --- 55,59 ---- void selectPen(RoadMapPen); void setPenColor(const char* color); + void setPenLineStyle(const char* style); void setPenThickness(int thickness); void erase(void); |
|
From: Paul F. <pg...@us...> - 2006-12-01 20:37:15
|
Update of /cvsroot/roadmap/roadmap/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9912/win32 Modified Files: roadmap_canvas.c Log Message: allow setting line style to "dashed". this implements it everywhere except agg. also, prevent calls in roadmap_layer.c that try to set thickness to 0. Index: roadmap_canvas.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_canvas.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** roadmap_canvas.c 12 Aug 2006 01:48:48 -0000 1.8 --- roadmap_canvas.c 1 Dec 2006 16:15:15 -0000 1.9 *************** *** 40,43 **** --- 40,44 ---- struct roadmap_canvas_pen *next; char *name; + int style; COLORREF color; int thinkness; *************** *** 106,111 **** CurrentPen = pen; ! old = SelectObject(RoadMapDrawingBuffer, CreatePen(PS_SOLID, ! CurrentPen->thinkness, CurrentPen->color)); if (OldHPen == NULL) OldHPen = old; --- 107,114 ---- CurrentPen = pen; ! old = SelectObject(RoadMapDrawingBuffer, ! CreatePen(CurrentPen->style, ! CurrentPen->thinkness, ! CurrentPen->color)); if (OldHPen == NULL) OldHPen = old; *************** *** 133,136 **** --- 136,140 ---- pen->color = RGB(0, 0, 0); pen->thinkness = 1; + pen->style = PS_SOLID; pen->next = RoadMapPenList; *************** *** 173,176 **** --- 177,190 ---- } + void roadmap_canvas_set_linestyle (const char *style) + { + if (CurrentPen != NULL) { + if (strcasecmp (style, "dashed") == 0) { + CurrentPen->style = PS_DASH; + } else { + CurrentPen->style = PS_SOLID; + } + } + } void roadmap_canvas_set_thickness(int thickness) |
|
From: Paul F. <pg...@us...> - 2006-12-01 19:41:48
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9912 Modified Files: roadmap_canvas.h roadmap_layer.c Log Message: allow setting line style to "dashed". this implements it everywhere except agg. also, prevent calls in roadmap_layer.c that try to set thickness to 0. Index: roadmap_layer.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_layer.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_layer.c 2 Nov 2006 01:27:42 -0000 1.12 --- roadmap_layer.c 1 Dec 2006 16:15:13 -0000 1.13 *************** *** 304,309 **** } ! roadmap_canvas_select_pen (layer->pen[0]); ! roadmap_canvas_set_thickness (thickness); layer->in_use[0] = 1; --- 304,312 ---- } ! if (thickness > 0) { ! roadmap_canvas_select_pen (layer->pen[0]); ! roadmap_canvas_set_thickness (thickness); ! } ! layer->in_use[0] = 1; *************** *** 718,721 **** --- 721,725 ---- const char *color[ROADMAP_MAX_LAYER_PENS]; + const char *style[ROADMAP_MAX_LAYER_PENS]; int thickness; *************** *** 746,751 **** color[0] = roadmap_config_get_from (class_config, layers[i], "Color"); ! /* Retrieve the layer's other colors (optional). */ for (pen_index = 1; pen_index < ROADMAP_MAX_LAYER_PENS; ++pen_index) { --- 750,758 ---- color[0] = roadmap_config_get_from (class_config, layers[i], "Color"); + /* Retrieve the first pen's style (optional). */ + style[0] = roadmap_config_get_from (class_config, layers[i], "Style"); ! ! /* Retrieve the layer's other colors and styles (optional). */ for (pen_index = 1; pen_index < ROADMAP_MAX_LAYER_PENS; ++pen_index) { *************** *** 768,771 **** --- 775,784 ---- if (color[pen_index] == NULL || *color[pen_index] == 0) break; + + snprintf (other_pen, other_pen_length, "Style%d", pen_index); + + style[pen_index] = + roadmap_config_get_from (class_config, layers[i], other_pen); + } layer->pen_count = pen_index; *************** *** 777,785 **** layer->pen[0] = roadmap_canvas_create_pen (layers[i]); thickness = roadmap_config_get_integer (&layer->thickness); roadmap_canvas_set_thickness (thickness); if (color[0] != NULL && *(color[0]) > ' ') { ! roadmap_canvas_set_foreground (color[0]); } --- 790,802 ---- layer->pen[0] = roadmap_canvas_create_pen (layers[i]); + if (style[0] != NULL && *(style[0]) > ' ') { + roadmap_canvas_set_linestyle (style[0]); + } + thickness = roadmap_config_get_integer (&layer->thickness); roadmap_canvas_set_thickness (thickness); if (color[0] != NULL && *(color[0]) > ' ') { ! roadmap_canvas_set_foreground (color[0]); } *************** *** 794,797 **** --- 811,818 ---- layer->pen[pen_index] = roadmap_canvas_create_pen (other_pen); + if (style[pen_index] != NULL && *(style[pen_index]) > ' ') { + roadmap_canvas_set_linestyle (style[pen_index]); + } + if (layer->delta_thickness[pen_index] < 0) { thickness += layer->delta_thickness[pen_index]; *************** *** 799,803 **** thickness = layer->delta_thickness[pen_index]; } ! roadmap_canvas_set_thickness (thickness); roadmap_canvas_set_foreground (color[pen_index]); --- 820,826 ---- thickness = layer->delta_thickness[pen_index]; } ! if (thickness > 0) { ! roadmap_canvas_set_thickness (thickness); ! } roadmap_canvas_set_foreground (color[pen_index]); Index: roadmap_canvas.h =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/roadmap_canvas.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** roadmap_canvas.h 12 Aug 2006 01:48:47 -0000 1.9 --- roadmap_canvas.h 1 Dec 2006 16:15:13 -0000 1.10 *************** *** 93,96 **** --- 93,97 ---- int roadmap_canvas_get_thickness (RoadMapPen pen); void roadmap_canvas_set_opacity (int opacity); + void roadmap_canvas_set_linestyle (const char *style); |
|
From: Paul F. <pg...@us...> - 2006-12-01 19:41:48
|
Update of /cvsroot/roadmap/roadmap/src/gtk In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9912/gtk Modified Files: roadmap_canvas.c Log Message: allow setting line style to "dashed". this implements it everywhere except agg. also, prevent calls in roadmap_layer.c that try to set thickness to 0. Index: roadmap_canvas.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_canvas.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** roadmap_canvas.c 19 Nov 2006 21:24:19 -0000 1.12 --- roadmap_canvas.c 1 Dec 2006 16:15:15 -0000 1.13 *************** *** 48,51 **** --- 48,52 ---- char *name; + GdkLineStyle style; GdkGC *gc; }; *************** *** 58,61 **** --- 59,63 ---- static GdkGC *RoadMapGc; + static RoadMapPen CurrentPen; /* The canvas callbacks: all callbacks are initialized to do-nothing *************** *** 120,124 **** RoadMapPen roadmap_canvas_select_pen (RoadMapPen pen) { - static RoadMapPen CurrentPen; RoadMapPen old_pen = CurrentPen; --- 122,125 ---- *************** *** 154,157 **** --- 155,159 ---- pen->gc = gc; + pen->style = GDK_LINE_SOLID; pen->next = RoadMapPenList; *************** *** 178,186 **** } void roadmap_canvas_set_thickness (int thickness) { gdk_gc_set_line_attributes ! (RoadMapGc, thickness, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND); } --- 180,198 ---- } + void roadmap_canvas_set_linestyle (const char *style) { + + if (strcasecmp (style, "dashed") == 0) { + CurrentPen->style = GDK_LINE_ON_OFF_DASH; + } else { + CurrentPen->style = GDK_LINE_SOLID; + } + } void roadmap_canvas_set_thickness (int thickness) { gdk_gc_set_line_attributes ! (RoadMapGc, thickness, CurrentPen->style, ! CurrentPen->style == GDK_LINE_SOLID ? GDK_CAP_ROUND : GDK_CAP_BUTT, ! GDK_JOIN_ROUND); } |
