Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb062b5a authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "DNG: Update TiffWriter to handle thumbnails and SubIfds."

parents 0c94309d 4510de26
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ class ANDROID_API FileInput : public Input {
         * of bytes given in the count argument will be read.  Bytes will be written
         * into the given buffer starting at the index given in the offset argument.
         *
         * Returns the number of bytes read.  If an error has occurred, the value pointed
         * to by the given status_t pointer will be set to a negative error code.
         * Returns the number of bytes read, or NOT_ENOUGH_DATA if at the end of the file.  If an
         * error has occurred, this will return a negative error code other than NOT_ENOUGH_DATA.
         */
        virtual size_t read(uint8_t* buf, size_t offset, size_t count, status_t* err);
        virtual ssize_t read(uint8_t* buf, size_t offset, size_t count);

        /**
         * Close the file descriptor to the path given in the constructor.
+11 −3
Original line number Diff line number Diff line
@@ -43,10 +43,18 @@ class ANDROID_API Input {
         * count argument will be read.  Bytes will be written into the given buffer starting
         * at the index given in the offset argument.
         *
         * Returns the number of bytes read.  If an error has occurred, the value pointed
         * to by the given status_t pointer will be set to a negative error code.
         * Returns the number of bytes read, or NOT_ENOUGH_DATA if at the end of the file.  If an
         * error has occurred, this will return a negative error code other than NOT_ENOUGH_DATA.
         */
        virtual size_t read(uint8_t* buf, size_t offset, size_t count, status_t* err) = 0;
        virtual ssize_t read(uint8_t* buf, size_t offset, size_t count) = 0;

        /**
         * Skips bytes in the input.
         *
         * Returns the number of bytes skipped, or NOT_ENOUGH_DATA if at the end of the file.  If an
         * error has occurred, this will return a negative error code other than NOT_ENOUGH_DATA.
         */
        virtual ssize_t skip(size_t count);

        /**
         * Close the Input.  It is not valid to call open on a previously closed Input.
+53 −0
Original line number Diff line number Diff line
/*
 * Copyright 2014 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#ifndef IMG_UTILS_STRIP_SOURCE_H
#define IMG_UTILS_STRIP_SOURCE_H

#include <img_utils/Output.h>

#include <cutils/compiler.h>
#include <utils/Errors.h>

#include <stdint.h>

namespace android {
namespace img_utils {

/**
 * This class acts as a data source for strips set in a TiffIfd.
 */
class ANDROID_API StripSource {
    public:
        virtual ~StripSource();

        /**
         * Write count bytes to the stream.
         *
         * Returns OK on success, or a negative error code.
         */
        virtual status_t writeToStream(Output& stream, uint32_t count) = 0;

        /**
         * Return the source IFD.
         */
        virtual uint32_t getIfd() const = 0;
};

} /*namespace img_utils*/
} /*namespace android*/

#endif /*IMG_UTILS_STRIP_SOURCE_H*/
+217 −12

File changed.

Preview size limit exceeded, changes collapsed.

+7 −6

File changed.

Preview size limit exceeded, changes collapsed.

Loading