Branch: Tag:

2008-06-28

2008-06-28 16:37:03 by Martin Nilsson <mani@lysator.liu.se>

static -> protected

Rev: lib/modules/ADT.pmod/Heap.pike:1.12
Rev: lib/modules/ADT.pmod/Queue.pike:1.14
Rev: lib/modules/ADT.pmod/Relation.pmod/Binary.pike:1.15
Rev: lib/modules/ADT.pmod/Struct.pike:1.20
Rev: lib/modules/ADT.pmod/Table.pmod:1.29
Rev: lib/modules/ADT.pmod/Trie.pike:1.6
Rev: lib/modules/ADT.pmod/module.pmod:1.12
Rev: lib/modules/Arg.pmod:1.6
Rev: lib/modules/Array.pmod:1.110
Rev: lib/modules/Audio.pmod/Codec.pmod:1.11
Rev: lib/modules/Audio.pmod/Format.pmod/MP3.pike:1.4
Rev: lib/modules/Cache.pmod/Storage.pmod/Gdbm.pike:1.12
Rev: lib/modules/Cache.pmod/cache.pike:1.14
Rev: lib/modules/Calendar.pmod/Austrian.pmod:1.8
Rev: lib/modules/Calendar.pmod/Badi.pmod:1.8
Rev: lib/modules/Calendar.pmod/Coptic.pmod:1.8
Rev: lib/modules/Calendar.pmod/Discordian.pmod:1.12
Rev: lib/modules/Calendar.pmod/Event.pmod:1.24
Rev: lib/modules/Calendar.pmod/Gregorian.pmod:1.12
Rev: lib/modules/Calendar.pmod/ISO.pmod:1.11
Rev: lib/modules/Calendar.pmod/Islamic.pmod:1.11
Rev: lib/modules/Calendar.pmod/Julian.pmod:1.11
Rev: lib/modules/Calendar.pmod/Language.pmod:1.25
Rev: lib/modules/Calendar.pmod/Rule.pmod:1.3
Rev: lib/modules/Calendar.pmod/Stardate.pmod:1.17
Rev: lib/modules/Calendar.pmod/Swedish.pmod:1.9
Rev: lib/modules/Calendar.pmod/TZnames.pmod:1.16
Rev: lib/modules/Calendar.pmod/Time.pmod:1.42
Rev: lib/modules/Calendar.pmod/TimeRanges.pmod:1.35
Rev: lib/modules/Calendar.pmod/Timezone.pmod:1.44
Rev: lib/modules/Calendar.pmod/YMD.pike:1.33
Rev: lib/modules/Calendar.pmod/module.pmod:1.16
Rev: lib/modules/Calendar_I.pmod/ISO.pmod:1.12
Rev: lib/modules/Calendar_I.pmod/Stardate.pmod:1.5
Rev: lib/modules/Crypto.pmod/DSA.pike:1.8
Rev: lib/modules/Crypto.pmod/HMAC.pike:1.5
Rev: lib/modules/Crypto.pmod/Koremutake.pmod:1.4
Rev: lib/modules/Crypto.pmod/PGP.pmod:1.14
Rev: lib/modules/Crypto.pmod/Pipe.pike:1.9
Rev: lib/modules/Crypto.pmod/RSA.pike:1.11
Rev: lib/modules/Crypto.pmod/Random.pmod:1.19
Rev: lib/modules/Crypto.pmod/Substitution.pike:1.4
Rev: lib/modules/Debug.pmod/Subject.pike:1.9
Rev: lib/modules/Debug.pmod/Wrapper.pike:1.6
Rev: lib/modules/Filesystem.pmod/System.pike:1.20
Rev: lib/modules/Filesystem.pmod/Tar.pmod:1.30
Rev: lib/modules/Filesystem.pmod/module.pmod:1.26
Rev: lib/modules/GLU.pmod:1.16
Rev: lib/modules/GLUE.pmod/Driver.pmod/GTK.pike:1.6
Rev: lib/modules/GLUE.pmod/Driver.pmod/Interface.pike:1.3
Rev: lib/modules/GLUE.pmod/Driver.pmod/SDL.pike:1.6
Rev: lib/modules/GLUE.pmod/Events.pmod:1.4
Rev: lib/modules/GLUE.pmod/module.pmod:1.15
Rev: lib/modules/GTKSupport.pmod/pCtree.pike:1.8
Rev: lib/modules/GTKSupport.pmod/pDrawingArea.pike:1.9
Rev: lib/modules/Geography.pmod/Countries.pmod:1.20
Rev: lib/modules/Geography.pmod/Position.pike:1.18
Rev: lib/modules/Getopt.pmod:1.33
Rev: lib/modules/Graphics.pmod/Graph.pmod/create_graph.pike:1.20
Rev: lib/modules/Graphics.pmod/Graph.pmod/module.pmod:1.9
Rev: lib/modules/Graphics.pmod/Graph.pmod/polyline.pike:1.7
Rev: lib/modules/Int.pmod:1.10
Rev: lib/modules/Local.pmod:1.11
Rev: lib/modules/Locale.pmod/Charset.pmod/Tables.pmod/iso88591.pmod:1.3
Rev: lib/modules/Locale.pmod/Charset.pmod/module.pmod:1.57
Rev: lib/modules/Locale.pmod/Language.pmod/nld.pmod:1.2
Rev: lib/modules/Locale.pmod/module.pmod:1.25
Rev: lib/modules/MIME.pmod/ext_to_media_type.pmod:1.7
Rev: lib/modules/MIME.pmod/module.pmod:1.20
Rev: lib/modules/Mapping.pmod:1.10
Rev: lib/modules/Parser.pmod/C.pmod:1.50
Rev: lib/modules/Parser.pmod/LR.pmod/GrammarParser.pmod:1.6
Rev: lib/modules/Parser.pmod/LR.pmod/module.pmod:1.17
Rev: lib/modules/Parser.pmod/Pike.pmod:1.41
Rev: lib/modules/Parser.pmod/RCS.pike:1.39
Rev: lib/modules/Parser.pmod/SGML.pike:1.3
Rev: lib/modules/Parser.pmod/XML.pmod/DOM.pmod:1.14
Rev: lib/modules/Parser.pmod/XML.pmod/NSTree.pmod:1.20
Rev: lib/modules/Parser.pmod/XML.pmod/Tree.pmod:1.72
Rev: lib/modules/Parser.pmod/XML.pmod/Validating.pike:1.14
Rev: lib/modules/Parser.pmod/module.pmod:1.25
Rev: lib/modules/Pike.pmod/module.pmod:1.19
Rev: lib/modules/Process.pmod:1.54
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Bencoding.pmod:1.5
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Peer.pike:1.21
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/PeerID.pmod:1.8
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Port.pike:1.7
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/Torrent.pike:1.36
Rev: lib/modules/Protocols.pmod/Bittorrent.pmod/module.pmod:1.4
Rev: lib/modules/Protocols.pmod/DNS.pmod:1.96
Rev: lib/modules/Protocols.pmod/DNS_SD.pmod:1.2
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Query.pike:1.93
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Port.pike:1.9
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/Request.pike:1.50
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Server.pmod/SSLPort.pike:1.14
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Session.pike:1.22
Rev: lib/modules/Protocols.pmod/HTTP.pmod/module.pmod:1.56
Rev: lib/modules/Protocols.pmod/Ident.pmod:1.12
Rev: lib/modules/Protocols.pmod/LDAP.pmod/client.pike:1.113
Rev: lib/modules/Protocols.pmod/LDAP.pmod/ldap_privates.pmod:1.15
Rev: lib/modules/Protocols.pmod/LDAP.pmod/module.pmod:1.32
Rev: lib/modules/Protocols.pmod/LDAP.pmod/protocol.pike:1.21
Rev: lib/modules/Protocols.pmod/LMTP.pmod:1.12
Rev: lib/modules/Protocols.pmod/Line.pmod:1.23
Rev: lib/modules/Protocols.pmod/LysKOM.pmod/Raw.pike:1.19
Rev: lib/modules/Protocols.pmod/OBEX.pmod:1.8
Rev: lib/modules/Protocols.pmod/SMTP.pmod/module.pmod:1.46
Rev: lib/modules/Protocols.pmod/SNMP.pmod/protocol.pike:1.19
Rev: lib/modules/Protocols.pmod/TELNET.pmod:1.28
Rev: lib/modules/Protocols.pmod/X.pmod/Extensions.pmod:1.16
Rev: lib/modules/Protocols.pmod/XMLRPC.pmod/module.pmod:1.30
Rev: lib/modules/Remote.pmod/module.pmod:1.8
Rev: lib/modules/SSL.pmod/Cipher.pmod:1.16
Rev: lib/modules/SSL.pmod/connection.pike:1.42
Rev: lib/modules/SSL.pmod/context.pike:1.37
Rev: lib/modules/SSL.pmod/session.pike:1.37
Rev: lib/modules/SSL.pmod/sslfile.pike:1.110
Rev: lib/modules/Sql.pmod/Sql.pike:1.92
Rev: lib/modules/Sql.pmod/mysql.pike:1.41
Rev: lib/modules/Sql.pmod/postgres.pike:1.28
Rev: lib/modules/Sql.pmod/rsql.pike:1.13
Rev: lib/modules/Sql.pmod/sql_result.pike:1.18
Rev: lib/modules/Sql.pmod/sql_util.pmod:1.21
Rev: lib/modules/Sql.pmod/tds.pike:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Decode.pmod:1.24
Rev: lib/modules/Standards.pmod/ASN1.pmod/Types.pmod:1.45
Rev: lib/modules/Standards.pmod/EXIF.pmod:1.29
Rev: lib/modules/Standards.pmod/FIPS10_4.pmod:1.4
Rev: lib/modules/Standards.pmod/ID3.pmod:1.24
Rev: lib/modules/Standards.pmod/IDNA.pmod:1.9
Rev: lib/modules/Standards.pmod/IIM.pmod:1.8
Rev: lib/modules/Standards.pmod/ISO639_2.pmod:1.19
Rev: lib/modules/Standards.pmod/URI.pike:1.28
Rev: lib/modules/Standards.pmod/UUID.pmod:1.17
Rev: lib/modules/Standards.pmod/XML.pmod/Wix.pmod:1.27
Rev: lib/modules/Stdio.pmod/FakeFile.pike:1.16
Rev: lib/modules/Stdio.pmod/Readline.pike:1.60
Rev: lib/modules/Stdio.pmod/Terminfo.pmod:1.27
Rev: lib/modules/Stdio.pmod/module.pmod:1.238
Rev: lib/modules/String.pmod/HTML.pmod:1.7
Rev: lib/modules/String.pmod/module.pmod:1.29
Rev: lib/modules/Thread.pmod:1.45
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/CExtractor.pmod:1.28
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/DocParser.pmod:1.62
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeExtractor.pmod:1.40
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeObjects.pmod:1.37
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike:1.52
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/ProcessXML.pmod:1.71
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/module.pmod:1.10
Rev: lib/modules/Tools.pmod/Hilfe.pmod:1.156
Rev: lib/modules/Tools.pmod/Install.pmod:1.35
Rev: lib/modules/Tools.pmod/Legal.pmod/Copyright.pmod:1.12
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/GPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/LGPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Legal.pmod/License.pmod/MPL.pmod:1.3
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerDeveloper.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/MongerUser.pike:1.8
Rev: lib/modules/Tools.pmod/Monger.pmod/module.pmod:1.3
Rev: lib/modules/Tools.pmod/PEM.pmod:1.14
Rev: lib/modules/Tools.pmod/PV.pike:1.10
Rev: lib/modules/Tools.pmod/Shoot.pmod/module.pmod:1.20
Rev: lib/modules/Tools.pmod/Standalone.pmod/assemble_autodoc.pike:1.35
Rev: lib/modules/Tools.pmod/Standalone.pmod/dump.pike:1.10
Rev: lib/modules/Tools.pmod/Standalone.pmod/join_autodoc.pike:1.19
Rev: lib/modules/Tools.pmod/Standalone.pmod/pmar_install.pike:1.8
Rev: lib/modules/Tools.pmod/Standalone.pmod/precompile.pike:1.2
Rev: lib/modules/Tools.pmod/Standalone.pmod/rsqld.pike:1.12
Rev: lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike:1.136
Rev: lib/modules/Tools.pmod/Testsuite.pmod:1.9
Rev: lib/modules/Tools.pmod/sed.pmod:1.6
Rev: lib/modules/Web.pmod/CGI.pmod/Request.pike:1.4
Rev: lib/modules/Web.pmod/Crawler.pmod:1.26
Rev: lib/modules/Web.pmod/OWL.pike:1.7
Rev: lib/modules/Web.pmod/RDF.pike:1.47
Rev: lib/modules/Web.pmod/RSS.pmod:1.7
Rev: lib/modules/Yabu.pmod/module.pmod:1.30
Rev: lib/modules/_Image.pmod/Dims.pmod:1.10
Rev: lib/modules/_Image.pmod/Fonts.pmod:1.13
Rev: lib/modules/_Image.pmod/module.pmod:1.47
Rev: lib/modules/_Image_DWG.pmod:1.5
Rev: lib/modules/_Image_PS.pmod:1.15
Rev: lib/modules/_Image_XCF.pmod:1.25

3:   //! This module implements EXIF (Exchangeable image file format for   //! Digital Still Cameras) 2.2 parsing.    - // $Id: EXIF.pmod,v 1.28 2008/01/13 17:04:00 nilsson Exp $ + // $Id: EXIF.pmod,v 1.29 2008/06/28 16:36:59 nilsson Exp $   // Johan Schön <js@roxen.com>, July 2001.   // Based on Exiftool by Robert F. Tobler <rft@cg.tuwien.ac.at>.   //
13:   // http://www.dalibor.cz/minolta/       - static void add_field(mapping m, string field, + protected void add_field(mapping m, string field,    mapping|array alts,    array(int) from, int index)   {
50:   }      #define SIZETEST(X) if(sizeof(data)<(X)+1) return res - static mapping canon_multi0(array(int) data) + protected mapping canon_multi0(array(int) data)   {    mapping res=([]);   
180:    return res;   }    - static mapping canon_multi1(array(int) data) { + protected mapping canon_multi1(array(int) data) {    mapping res = ([]);       SIZETEST(1);
188:    return res;   }    - static mapping canon_multi3(array(int) data) + protected mapping canon_multi3(array(int) data)   {    mapping res=([]);   
247:    return res;   }    - static mapping canon_multi4(array(int) data) { + protected mapping canon_multi4(array(int) data) {    mapping res = ([]);    add_field(res, "CanonStichDirection",    ({ "Left to right", "Right to left", "Bottom to top", "Top to bottom" }),
255:    return res;   }    - static mapping CANON_D30_MAKERNOTE = ([ + protected mapping CANON_D30_MAKERNOTE = ([    0x0001: ({"MN_Multi0", "CUSTOM", canon_multi0 }),    0x0002: ({"MN_Multi1", "CUSTOM", canon_multi1 }),    0x0004: ({"MN_Multi3", "CUSTOM", canon_multi3 }),
268:    // 0x000F: ({"MN_CustomFunctions", "CUSTOM", canon_custom }),   ]);    - static mapping NIKON_D_MAKERNOTE = ([ + protected mapping NIKON_D_MAKERNOTE = ([    0x0001: ({ "MN_FirmwareVersion" }),    0x0002: ({ "MN_ISO" }),    0x0004: ({ "MN_Quality" }),
303:    0x0e01: ({ "MN_CaptureEditorData" }),   ]);    - static mapping|string nikon_D70_makernote(string data, mapping real_tags) { + protected mapping|string nikon_D70_makernote(string data, mapping real_tags) {    object f = Stdio.FakeFile(data);    if(f->read(10)!="Nikon\0\2\20\0\0") return data;    string order = f->read(2);
337:    return UNDEFINED;   }    - static mapping nikon_iso(array(int) data) { + protected mapping nikon_iso(array(int) data) {    mapping res=([]);       SIZETEST(1);
346:   }      // NIKON 990, D1 (more?) - static mapping NIKON_990_MAKERNOTE = ([ + protected mapping NIKON_990_MAKERNOTE = ([    0x0001: ({"MN_0x0001", }),    0x0002: ({"MN_ISOSetting", "CUSTOM", nikon_iso }),    0x0003: ({"MN_ColorMode", }),
380:    0x0010: ({"MN_DataDump", }),   ]);    - static mapping sanyo_specialmode(array(int) data) { + protected mapping sanyo_specialmode(array(int) data) {    mapping res = ([]);       add_field(res, "SanyoSpecialMode",
400:    return res;   }    - static mapping sanyo_jpegquality(array(int) data) { + protected mapping sanyo_jpegquality(array(int) data) {    mapping res=([]);       int r = data[0]&0xff;
414:    return res;   }    - static mapping SANYO_MAKERNOTE = ([ + protected mapping SANYO_MAKERNOTE = ([    0x00ff: ({"MN_StartOffset", }),    0x0100: ({"MN_JPEGThumbnail", }),    0x0200: ({"MN_SpecialMode", "CUSTOM", sanyo_specialmode }),
468:    0x0f00: ({"MN_DataDump", }),   ]);    - static mapping OLYMPUS_MAKERNOTE = ([ + protected mapping OLYMPUS_MAKERNOTE = ([    0x0100: ({"MN_JPEGThumbnail" }),    0x0200: ({"MN_SpecialMode", "CUSTOM", sanyo_specialmode }),    0x0201: ({"MN_JPEGQuality", "MAP",
484:   ]);      // Nikon E700/E800/E900/E900S/E910/E950 - static mapping NIKON_MAKERNOTE = ([ + protected mapping NIKON_MAKERNOTE = ([    0x0002: ({"MN_0x0002", }),    0x0003: ({"MN_Quality", "MAP",    ([ 1:"VGA Basic",
520:    0x0f00: ({"MN_0x0f00", }),   ]);    - static mapping CASIO_MAKERNOTE = ([ + protected mapping CASIO_MAKERNOTE = ([    0x0001: ({"MN_RecordingMode", "MAP",    ([ 1:"Single Shutter",    2:"Panorama",
581:    100:"High", ]) }),   ]);    - static mapping FUJIFILM_MAKERNOTE = ([ + protected mapping FUJIFILM_MAKERNOTE = ([    0x0000: ({"MN_Version", }),    0x1000: ({"MN_Quality", }),    0x1001: ({"MN_Sharpness", "MAP",
631:    0x1302: ({"MN_AEWarning", "MAP", ([ 0:"No", 1:"Yes" ]) }),   ]);    - static mapping GPS_TAGS = ([ + protected mapping GPS_TAGS = ([    0x0000: ({"GPSVersionID"}),    0x0001: ({"GPSLatitudeRef"}),    0x0002: ({"GPSLatitude"}),
661:    0x001A: ({"GPSDestDistance"}),   ]);    - static mapping TAG_INFO = ([ + protected mapping TAG_INFO = ([    0x0001: ({"InteroperabilityIndex", }),    0x0002: ({"InteroperabilityVersion", }),    0x00fe: ({"NewSubFileType", }),
894:    0xa420: ({"ImageUniqueID", "ASCII" }),   ]);    - static mapping TAG_TYPE_INFO = + protected mapping TAG_TYPE_INFO =    ([1: ({"BYTE", 1}),    2: ({"ASCII", 1}),    3: ({"SHORT", 2}),
909:    12: ({"DOUBLE", 8}),    ]);    - static int short_value(string str, string order) + protected int short_value(string str, string order)   {    if(order=="MM")    return (str[0]<<8)|str[1];
917:    return (str[1]<<8)|str[0];   }    - static int long_value(string str, string order) + protected int long_value(string str, string order)   {    if(order=="MM")    return (str[0]<<24)|(str[1]<<16)|(str[2]<<8)|str[3];
925:    return (str[3]<<24)|(str[2]<<16)|(str[1]<<8)|str[0];   }    - static void exif_seek(Stdio.File file, int offset, int exif_offset) + protected void exif_seek(Stdio.File file, int offset, int exif_offset)   {    file->seek(offset+exif_offset);   }    - static string format_bytes(string str) + protected string format_bytes(string str)   {    return str;   }    - static mapping parse_tag(Stdio.File file, mapping tags, mapping exif_info, + protected mapping parse_tag(Stdio.File file, mapping tags, mapping exif_info,    int exif_offset, string order)   {    int tag_id=short_value(file->read(2), order);