← Back to branch summary

~ubuntu-branches/ubuntu/precise/exiv2/precise

« back to all changes in this revision

Viewing changes to src/makernote.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Anthony Mercatante
  • Date: 2006-12-07 18:40:10 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20061207184010-0ouu8v0dr8nznob9
Tags: 0.12-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/makernote.cpp
20
20
 */
21
21
/*
22
22
  File:      makernote.cpp
23
 
  Version:   $Rev: 669 $
 
23
  Version:   $Rev: 979 $
24
24
  Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
25
25
  History:   18-Feb-04, ahu: created
26
26
 */
27
27
// *****************************************************************************
28
28
#include "rcsid.hpp"
29
 
EXIV2_RCSID("@(#) $Id: makernote.cpp 669 2006-01-17 14:53:57Z ahuggel $");
 
29
EXIV2_RCSID("@(#) $Id: makernote.cpp 979 2006-11-16 11:14:18Z ahuggel $")
30
30
 
31
31
// Define DEBUG_* to output debug information to std::cerr, e.g, by calling
32
32
// make like this: make DEFS=-DDEBUG_MAKERNOTE makernote.o
132
132
        return len;
133
133
    } // IfdMakerNote::copy
134
134
 
135
 
    int IfdMakerNote::readHeader(const byte* buf,
136
 
                                 long len,
137
 
                                 ByteOrder byteOrder)
 
135
    int IfdMakerNote::readHeader(const byte* /*buf*/,
 
136
                                 long        /*len*/,
 
137
                                 ByteOrder   /*byteOrder*/)
138
138
    {
139
139
        // Default implementation does nothing, assuming there is no header
140
140
        return 0;
142
142
 
143
143
    void IfdMakerNote::updateBase(byte* pNewBase)
144
144
    {
145
 
        if (absShift_) {
146
 
            ifd_.updateBase(pNewBase);
147
 
        }
 
145
        ifd_.updateBase(pNewBase);
148
146
    }
149
147
 
150
148
    int IfdMakerNote::checkHeader() const