Changeset 11027 for trunk/FACT++/src

Timestamp:

06/15/11 11:01:24 (13 years ago)

Author:

tbretz

Message:

Allow support for chars; assume that the given size is the destination size

File:

• trunk/FACT++/src/Converter.cc (modified) (4 diffs)

trunk/FACT++/src/Converter.cc

@@ -856 +856 @@
 }
 
-
+// --------------------------------------------------------------------------
+//
+//! @param dest
+//!    Array to which the destination data is written
+//! @param src
+//!    Array with the source data according to the format stored in the
+//!    Converter
+//! @param size
+//!    size of the destination data in bytes
+//!
 void Converter::ToFits(void *dest, const void *src, size_t size) const
 {
@@ -870 +879 @@
    for (Converter::FormatList::const_iterator i=fList.begin(); i!=fList.end(); i++)
    {
-       if (charDest-size>dest)
+       if (charDest-size>dest/* || charSrc-size>src*/)
        {
            ostringstream err;
@@ -883 +892 @@
        if (type=='S')
        {
-           size -= strlen(charSrc)+1;
            charSrc += strlen(charSrc)+1;
+           continue;
 
            // copy string until termination
-//           while (*charSrc)
-//               *charDest++ = *charSrc++;
-//
-//           *charDest++ = *charSrc++;
+           // while (*charSrc)
+           //     *charDest++ = *charSrc++;
+           //
+           // *charDest++ = *charSrc++;
        }
 
        // string types
-       if (string("bsilfdx").find_first_of(type)==string::npos)
+       if (string("bsilfdxc").find_first_of(type)==string::npos)
            throw runtime_error(string("Type '")+type+"' not supported converting to FITS.");
 
@@ -910 +919 @@
    }
 
-   if (charDest-size!=dest)
+   if (charDest-size!=dest/* || charSrc-size!=src*/)
    {
        ostringstream err;