No OneTemporary
Actions

Size

56 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/xmount_morphing.h b/src/xmount_morphing.h
	index 1d6c82c..56d6492 100644
	--- a/src/xmount_morphing.h
	+++ b/src/xmount_morphing.h
	@@ -1,343 +1,343 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2016 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* 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 3 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, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#ifndef XMOUNT_MORPHING_H
	#define XMOUNT_MORPHING_H

	/*******************************************************************************
	* Public definitions / macros
	******************************************************************************/
	//! Naming scheme of morphing libraries
	#define XMOUNT_MORPHING_LIBRARY_NAMING_SCHEME "libxmount_morph_"

	/*******************************************************************************
	* Public types / structures / enums
	******************************************************************************/
	//! Morphing handle
	typedef struct s_XmountMorphHandle *pts_XmountMorphHandle;

	/*!
	* \brief Function to get the amount of input images
	*
	* Function to get the amount of input images
	*
	* \param p_count Count of input images
	* \return 0 on success
	*/
	typedef int (tfun_XmountMorphing_InputImageCount)(uint64_t p_count);

	/*!
	* \brief Function to get the size of the morphed data
	*
	* Function to get the size of the morphed data
	*
	* \param image Image number
	* \param p_size Pointer to store input image's size to
	* \return 0 on success
	*/
	typedef int (tfun_XmountMorphing_InputImageSize)(uint64_t image, uint64_t p_size);

	//! Function to read data from input image
	/*!
	* \param image Image number
	* \param p_buf Buffer to store read data to
	* \param offset Position at which to start reading
	* \param count Amount of bytes to read
	* \param p_read Number of read bytes on success
	* \return 0 on success or negated error code on error
	*/
	typedef int (*tfun_XmountMorphing_InputImageRead)(uint64_t image,
	char *p_buf,
	off_t offset,
	size_t count,
	size_t *p_read);

	//! Function to write data to input image
	/*!
	* \param image Image number
	* \param p_buf Buffer to store read data to
	* \param offset Position at which to start reading
	* \param count Amount of bytes to read
	* \param p_read Number of read bytes on success
	* \return 0 on success or negated error code on error
	*/
	typedef int (*tfun_XmountMorphing_InputImageWrite)(uint64_t image,
	char *p_buf,
	off_t offset,
	size_t count,
	size_t *p_written);

	typedef enum e_XmountMorphError {
	//! No error
	e_XmountMorphError_None=0,
	//! Error to allocate memory
	e_XmountMorphError_Alloc,
	//! Invalid morphing handle
	e_XmountMorphError_InvalidHandle,
	//! Invalid pointer to a morphing handle
	e_XmountMorphError_InvalidHandlePointer,
	//! A given buffer is invalid
	e_XmountMorphError_InvalidBuffer,
	//! A given string is invalid
	e_XmountMorphError_InvalidString,
	//! Library options have already been set
	e_XmountMorphError_LibOptionsAlreadySet,
	//! Library options couldn't be parsed
	e_XmountMorphError_FailedParsingOptions,
	//! Unable to get info file content from library
	e_XmountMorphError_FailedGettingInfoFileContent,
	//! Unable to load library file
	e_XmountMorphError_FailedLoadingLibrary,
	//! Unable to load a library symbol
	e_XmountMorphError_FailedLoadingSymbol,
	//! Library has wrong API version
	e_XmountMorphError_WrongLibraryApiVersion,
	//! Library is missing a function
	e_XmountMorphError_MissingLibraryFunction,
	//! Unsupported morphing type
	e_XmountMorphError_UnsupportedType,
	//! Unable to create morphing image handle
	e_XmountMorphError_FailedCreatingMorphHandle,
	//! Unable to parse morphing library options
	e_XmountMorphError_FailedParsingLibParams,
	//! Unable to get image size
	e_XmountMorphError_FailedGettingImageSize,
	//! A specified offset is larger than the image
	e_XmountMorphError_OffsetExceedsImageSize,
	//! Unable to read data from morphed image
	e_XmountMorphError_FailedReadingData
	} te_XmountMorphError;

	/*******************************************************************************
	* Public functions declarations
	******************************************************************************/
	/*!
	* \brief Create new morphing handle
	*
	* Creates a new morphing handle.
	*
	* \param pp_h Pointer to morphing handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError
	XmountMorphing_CreateHandle(pts_XmountMorphHandle *pp_h,
	tfun_XmountMorphing_InputImageCount p_img_count,
	tfun_XmountMorphing_InputImageSize p_img_size,
	tfun_XmountMorphing_InputImageRead p_img_read,
	tfun_XmountMorphing_InputImageWrite p_img_write);

	/*!
	* \brief Destroy morphing handle
	*
	* Invalidates the given handle and frees all used resources.
	*
	* \param pp_h Pointer to morphing handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_DestroyHandle(pts_XmountMorphHandle *pp_h);

	/*!
	* \brief Enable internal debugging
	*
	* Enables the generation of intrernal debugging messages.
	*
	* \param p_h Morphing handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_EnableDebugging(pts_XmountMorphHandle p_h);

	/*!
	* \brief Load a morphing library
	*
	* Loads a given morphing library.
	*
	* \param p_h Morphing handle
	* \param p_lib Library name (without path)
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_AddLibrary(pts_XmountMorphHandle p_h,
	const char *p_lib_name);

	/*!
	* \brief Get loaded morphing library count
	*
	* Returns the number of successfully loaded morphing libraries.
	*
	* \param p_h Morphing handle
	* \param p_count Library count is returned in this variable
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_GetLibraryCount(pts_XmountMorphHandle p_h,
	uint32_t *p_count);

	/*!
	* \brief Return all supported morphing types
	*
	* Returns a null-terminated vector of all supported morphing types.
	*
	* The returned vector must be freed by the caller.
	*
	* \param p_h Morphing handle
	* \param pp_types Supported types vector is returned in this var
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_GetSupportedTypes(pts_XmountMorphHandle p_h,
	char **pp_types);

	/*!
	* \brief Set library options
	*
	- * Parses the given library option string (as given after --inopts).
	+ * Parses the given library option string (as given after --morphopts).
	*
	* \param p_h Morphing handle
	* \param p_options Library option string
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_SetOptions(pts_XmountMorphHandle p_h,
	char *p_options);

	/*!
	* \brief Return all library specific option help texts
	*
	* Returns a string containing help messages for all loaded morphing lib
	* options. The string is pre-formated to be used in xmount's help output.
	*
	* The caller must free the returned string.
	*
	* \param p_h Morphing handle
	* \param pp_help_text Help text is returned in this parameter
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_GetOptionsHelpText(pts_XmountMorphHandle p_h,
	char **pp_help_text);

	/*!
	* \brief Returns a string containing infos about loaded libs
	*
	* Returns a string containing infos about loaded morphing libraries. The
	* string is pre-formated to be used in xmount's info output.
	*
	* The caller must free the returned string.
	*
	* \param p_h Morphing handle
	* \param pp_info_text Info text is returned in this parameter
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_GetLibsInfoText(pts_XmountMorphHandle p_h,
	char **pp_info_text);

	/*!
	* \brief Set morphing type
	*
	* Set the morphing type that should be applied to the input image.
	*
	* \param p_h Morphing handle
	* \param p_type Morphing type string as specified with xmount's --morph option.
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_SetType(pts_XmountMorphHandle p_h,
	char *p_type);

	/*!
	* \brief Start the morphing process
	*
	* Begins the morphing process.
	*
	* \param p_h Morphing handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_StartMorphing(pts_XmountMorphHandle p_h);

	/*!
	* \brief Stop the morphing process
	*
	* Ends the morphing process.
	*
	* \param p_h Morphing handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_StopMorphing(pts_XmountMorphHandle p_h);

	/*!
	* \brief Get the size of the morphed image
	*
	* Returns the size (in bytes) of the morphed image.
	*
	* \param p_h Morphing handle
	* \param image_nr Image number for which to return the size
	* \param p_size On success, size is returned in this variable
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_GetSize(pts_XmountMorphHandle p_h,
	uint64_t *p_size);

	/*!
	* \brief Read data from the morphed image
	*
	* Reads count bytes from the morphed image starting at given offset and
	* copies the data into p_buf.
	*
	* The given buffer must be pre-allocated to hold as many bytes as should be
	* read!
	*
	* \param p_h Morphing handle
	* \param p_buf Buffer into which to copy read data
	* \param offset Offset at which to start reading
	* \param count Amount of bytes to read
	* \param p_read On success, amount of bytes read is returned in this variable
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_ReadData(pts_XmountMorphHandle p_h,
	char *p_buf,
	uint64_t offset,
	uint64_t count,
	uint64_t *p_read);

	/*!
	* \brief Writes data to the morphed image
	*
	* Writes count bytes from p_buf to the morphed image starting at the given
	* offset.
	*
	* \param p_h Morphing handle
	* \param p_buf Buffer with data to write
	* \param offset Offset at which to start writing
	* \param count Amount of bytes to write
	* \param p_written On success, amount of bytes written is returned here
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_WriteData(pts_XmountMorphHandle p_h,
	const char *p_buf,
	uint64_t offset,
	uint64_t count,
	uint64_t *p_written);

	/*!
	* \brief Get info text to be added to xmount's info file
	*
	* Generates a string containing informations about the currently morphed image.
	*
	* The caller must free the returned string.
	*
	* \param p_h Morphing handle
	* \param pp_content Buffer in which text is returned
	* \return e_XmountMorphError_None on success
	*/
	te_XmountMorphError XmountMorphing_GetInfoFileContent(pts_XmountMorphHandle p_h,
	char **pp_content);

	#endif // XMOUNT_MORPHING_H
	diff --git a/src/xmount_output.c b/src/xmount_output.c
	index 79d2097..3805880 100644
	--- a/src/xmount_output.c
	+++ b/src/xmount_output.c
	@@ -1,756 +1,791 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2016 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* 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 3 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, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#include <stdlib.h> // For calloc
	#include <string.h> // For memcpy
	#include <dlfcn.h> // For dlopen, dlclose, dlsym

	#include "../libxmount_output/libxmount_output.h"
	#include "xmount_output.h"
	#include "xmount.h"
	#include "macros.h"

	/*******************************************************************************
	* Private definitions / macros
	******************************************************************************/

	#define LOG_WARNING(...) { \
	LIBXMOUNT_LOG_WARNING(__VA_ARGS__); \
	}
	#define LOG_ERROR(...) { \
	LIBXMOUNT_LOG_ERROR(__VA_ARGS__); \
	}
	#define LOG_DEBUG(...) { \
	LIBXMOUNT_LOG_DEBUG(glob_xmount.debug,__VA_ARGS__); \
	}

	/*******************************************************************************
	* Private types / structures / enums
	******************************************************************************/

	//! Structure containing infos about output libs
	typedef struct s_XmountOutputLib {
	//! Filename of lib (without path)
	char *p_name;
	//! Handle to the loaded lib
	void *p_lib;
	//! Array of supported output formats
	char *p_supported_output_formats;
	//! Struct containing lib functions
	ts_LibXmountOutput_Functions lib_functions;
	} ts_XmountOutputLib, *pts_XmountOutputLib;

	//! Structure containing infos about output image
	typedef struct s_XmountOutputHandle {
	//! Loaded output lib count
	uint32_t libs_count;
	//! Array containing infos about loaded output libs
	pts_XmountOutputLib *pp_libs;
	//! Specified output format (--out)
	char *p_output_format;
	//! Amount of specified output lib params
	uint32_t lib_params_count;
	//! Specified output lib params (--outopts)
	pts_LibXmountOptions *pp_lib_params;
	//! Handle to initialized output lib
	void *p_handle;
	//! Transformation functions of initialized lib
	pts_LibXmountOutput_Functions p_functions;
	//! Output image functions passed to output lib
	ts_LibXmountOutput_Functions output_functions;
	//! Size
	uint64_t image_size;
	//! Writable? (Set to 1 if --cache was specified)
	uint8_t writable;
	//! Path of virtual image file
	char *p_virtual_image_path;
	//! Path of virtual image info file
	char *p_info_path;
	//! Pointer to virtual info file
	char *p_info_file;
	//! Debug
	uint8_t debug;
	} ts_XmountOutputHandle;

	/*******************************************************************************
	* Private functions declarations
	******************************************************************************/
	/*!
	* \brief Find an input lib for a given input image
	*
	* Searches trough the list of loaded input libraries to find one that supports
	* the given input image's format. On success, that library is associated with
	* the given image.
	*
	* \param p_h Output handle
	* \param p_input_image Output image to search input lib for
	* \return e_XmountOutputError_None on success
	*/
	te_XmountOutputError XmountOutput_FindLib(pts_XmountOutputHandle p_h);

	/*******************************************************************************
	* Public functions implementations
	******************************************************************************/
	/*
	* XmountOutput_CreateHandle
	*/
	te_XmountOutputError
	XmountOutput_CreateHandle(pts_XmountOutputHandle *pp_h,
	tfun_XmountOutput_InputImageSize p_img_size,
	tfun_XmountOutput_InputImageRead p_img_read,
	tfun_XmountOutput_InputImageWrite p_img_write)
	{
	pts_XmountOutputHandle p_h=NULL;

	// Params check
	if(pp_h==NULL) return e_XmountOutputError_InvalidHandlePointer;
	+
	+ // TODO: Implement
	+
	/*
	// Alloc new handle
	p_h=(pts_XmountOutputHandle)calloc(1,sizeof(ts_XmountOutputHandle));
	if(p_h==NULL) {
	return e_XmountOutputError_Alloc;
	}

	// Init values
	p_h->pp_libs=NULL;
	p_h->pp_lib_params=NULL;
	p_h->pp_images=NULL;
	*/
	+
	*pp_h=p_h;
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_DestroyHandle
	*/
	te_XmountOutputError XmountOutput_DestroyHandle(pts_XmountOutputHandle *pp_h) {
	pts_XmountOutputHandle p_h=NULL;
	+
	+ // TODO: Implement
	/*
	// Params check
	if(pp_h==NULL) return e_XmountOutputError_InvalidHandlePointer;
	if(*pp_h==NULL) return e_XmountOutputError_InvalidHandle;
	p_h=*pp_h;

	// Free resources
	if(p_h->images_count!=0 && p_h->pp_images!=NULL) {
	// TODO: Close images
	}
	if(p_h->libs_count>0 && p_h->pp_libs!=NULL) {
	// Unload all input libs
	for(uint32_t i=0;i<p_h->libs_count;i++) {
	if(p_h->pp_libs[i]->p_supported_input_types!=NULL) {
	XMOUNT_FREE(p_h->pp_libs[i]->p_supported_input_types);
	}
	if(p_h->pp_libs[i]->p_lib!=NULL) {
	dlclose(p_h->pp_libs[i]->p_lib);
	p_h->pp_libs[i]->p_lib=NULL;
	}
	if(p_h->pp_libs[i]->p_name!=NULL) {
	XMOUNT_FREE(p_h->pp_libs[i]->p_name);
	}
	XMOUNT_FREE(p_h->pp_libs[i]);
	}
	XMOUNT_FREE(p_h->pp_libs);
	p_h->libs_count=0;
	}
	if(p_h->lib_params_count!=0 && p_h->pp_lib_params!=NULL) {
	// Free library parameter array
	for(uint32_t i=0;i<p_h->lib_params_count;i++) {
	XMOUNT_FREE(p_h->pp_lib_params[i]);
	}
	XMOUNT_FREE(p_h->pp_lib_params);
	p_h->lib_params_count=0;
	}
	*/
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_EnableDebugging
	*/
	te_XmountOutputError XmountOutput_EnableDebugging(pts_XmountOutputHandle p_h) {
	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;

	+ // Enable debugging
	p_h->debug=1;
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_AddLibrary
	*/
	te_XmountOutputError XmountOutput_AddLibrary(pts_XmountOutputHandle p_h,
	- const char *p_lib_name)
	+ const char *p_lib_name)
	{
	+ // TODO: Implement
	/*
	uint32_t supported_formats_len=0;
	t_LibXmount_Output_GetApiVersion pfun_input_GetApiVersion;
	t_LibXmount_Output_GetSupportedFormats pfun_input_GetSupportedFormats;
	t_LibXmount_Output_GetFunctions pfun_input_GetFunctions;
	void *p_libxmount=NULL;
	pts_XmountOutputLib p_input_lib=NULL;
	char *p_buf=NULL;
	char *p_library_path=NULL;
	char *p_supported_formats=NULL;

	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(p_lib_name==NULL) return e_XmountOutputError_InvalidString;

	// Construct full library path
	XMOUNT_STRSET(p_library_path,XMOUNT_LIBRARY_PATH);
	if(p_library_path[strlen(p_library_path)]!='/') {
	XMOUNT_STRAPP(p_library_path,"/");
	}
	XMOUNT_STRAPP(p_library_path,p_lib_name);

	#define XMOUNTINPUT_LOADLIBS__LOAD_SYMBOL(name,pfun) { \
	if((pfun=dlsym(p_libxmount,name))==NULL) { \
	LOG_ERROR("Unable to load symbol '%s' from library '%s'!\n", \
	name, \
	p_library_path); \
	dlclose(p_libxmount); \
	return e_XmountOutputError_FailedLoadingSymbol; \
	} \
	}

	// Try to load given library
	p_libxmount=dlopen(p_library_path,RTLD_NOW);
	if(p_libxmount==NULL) {
	LOG_ERROR("Unable to load input library '%s': %s!\n",
	p_library_path,
	dlerror());
	return e_XmountOutputError_FailedLoadingLibrary;
	}

	// Load library symbols
	XMOUNTINPUT_LOADLIBS__LOAD_SYMBOL("LibXmount_Output_GetApiVersion",
	pfun_input_GetApiVersion);

	// Check library's API version
	if(pfun_input_GetApiVersion()!=LIBXMOUNT_INPUT_API_VERSION) {
	LOG_DEBUG("Failed! Wrong API version.\n");
	LOG_ERROR("Unable to load input library '%s'. Wrong API version\n",
	p_library_path);
	dlclose(p_libxmount);
	return e_XmountOutputError_WrongLibraryApiVersion;
	}

	XMOUNTINPUT_LOADLIBS__LOAD_SYMBOL("LibXmount_Output_GetSupportedFormats",
	pfun_input_GetSupportedFormats);
	XMOUNTINPUT_LOADLIBS__LOAD_SYMBOL("LibXmount_Output_GetFunctions",
	pfun_input_GetFunctions);

	// Construct new entry for our library list
	XMOUNT_MALLOC(p_input_lib,pts_XmountOutputLib,sizeof(ts_XmountOutputLib));
	// Initialize lib_functions structure to NULL
	memset(&(p_input_lib->lib_functions),
	0,
	sizeof(ts_LibXmountOutputFunctions));

	// Set name and handle
	XMOUNT_STRSET(p_input_lib->p_name,p_lib_name);
	p_input_lib->p_lib=p_libxmount;

	// Get and set supported formats
	p_supported_formats=pfun_input_GetSupportedFormats();
	p_buf=p_supported_formats;
	while(*p_buf!='\0') {
	supported_formats_len+=(strlen(p_buf)+1);
	p_buf+=(strlen(p_buf)+1);
	}
	supported_formats_len++;
	XMOUNT_MALLOC(p_input_lib->p_supported_input_types,
	char*,
	supported_formats_len);
	memcpy(p_input_lib->p_supported_input_types,
	p_supported_formats,
	supported_formats_len);

	// Get, set and check lib_functions
	pfun_input_GetFunctions(&(p_input_lib->lib_functions));
	if(p_input_lib->lib_functions.CreateHandle==NULL \|\|
	p_input_lib->lib_functions.DestroyHandle==NULL \|\|
	p_input_lib->lib_functions.Open==NULL \|\|
	p_input_lib->lib_functions.Close==NULL \|\|
	p_input_lib->lib_functions.Size==NULL \|\|
	p_input_lib->lib_functions.Read==NULL \|\|
	p_input_lib->lib_functions.OptionsHelp==NULL \|\|
	p_input_lib->lib_functions.OptionsParse==NULL \|\|
	p_input_lib->lib_functions.GetInfofileContent==NULL \|\|
	p_input_lib->lib_functions.GetErrorMessage==NULL \|\|
	p_input_lib->lib_functions.FreeBuffer==NULL)
	{
	LOG_DEBUG("Missing implemention of one or more functions in lib %s!\n",
	p_lib_name);
	XMOUNT_FREE(p_input_lib->p_supported_input_types);
	XMOUNT_FREE(p_input_lib->p_name);
	XMOUNT_FREE(p_input_lib);
	dlclose(p_libxmount);
	return e_XmountOutputError_MissingLibraryFunction;
	}

	// Add entry to the input library list
	XMOUNT_REALLOC(p_h->pp_libs,
	pts_XmountOutputLib*,
	sizeof(pts_XmountOutputLib)*(p_h->libs_count+1));
	p_h->pp_libs[p_h->libs_count++]=p_input_lib;

	LOG_DEBUG("Output library '%s' loaded successfully\n",p_lib_name);

	#undef XMOUNTINPUT_LOADLIBS__LOAD_SYMBOL
	*/
	return e_XmountOutputError_None;
	}

	te_XmountOutputError XmountOutput_GetLibraryCount(pts_XmountOutputHandle p_h,
	uint32_t *p_count)
	{
	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(p_count==NULL) return e_XmountOutputError_InvalidBuffer;

	+ // Return library count
	*p_count=p_h->libs_count;
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_GetSupportedFormats
	*/
	-te_XmountOutputError XmountOutput_GetSupportedFormats(pts_XmountOutputHandle p_h,
	- char **pp_formats)
	+te_XmountOutputError
	+ XmountOutput_GetSupportedFormats(pts_XmountOutputHandle p_h,
	+ char **pp_formats)
	{
	char *p_buf=NULL;
	char *p_formats=NULL;
	uint32_t cur_len=0;
	uint32_t vector_len=0;

	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(pp_formats==NULL) return e_XmountOutputError_InvalidBuffer;

	// Loop over all loaded libs, extract supported formats and add to our vector
	// TODO: IMPROVEMENT: Final vector could be sorted
	for(uint32_t i=0;i<p_h->libs_count;i++) {
	- p_buf=p_h->pp_libs[i]->p_supported_input_types;
	+ p_buf=p_h->pp_libs[i]->p_supported_output_formats;
	while(p_buf!=NULL && *p_buf!='\0') p_buf+=(strlen(p_buf)+1);
	- cur_len=(uint32_t)(p_buf-p_h->pp_libs[i]->p_supported_input_types);
	+ cur_len=(uint32_t)(p_buf-p_h->pp_libs[i]->p_supported_output_formats);
	if(cur_len==0) continue;
	p_formats=(char*)realloc(p_formats,vector_len+cur_len);
	if(p_formats==NULL) return e_XmountOutputError_Alloc;
	memcpy(p_formats+vector_len,
	- p_h->pp_libs[i]->p_supported_input_types,
	+ p_h->pp_libs[i]->p_supported_output_formats,
	cur_len);
	vector_len+=cur_len;
	}

	// Null-terminate vector
	p_formats=(char*)realloc(p_formats,vector_len+1);
	if(p_formats==NULL) return e_XmountOutputError_Alloc;
	p_formats[vector_len]='\0';

	*pp_formats=p_formats;
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_SetOptions
	*/
	te_XmountOutputError XmountOutput_SetOptions(pts_XmountOutputHandle p_h,
	- char *p_options)
	+ char *p_options)
	{
	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(p_options==NULL) return e_XmountOutputError_InvalidString;

	// Make sure library parameters haven't been set previously
	if(p_h->pp_lib_params!=NULL) {
	LOG_ERROR("Output library options already set!\n");
	return e_XmountOutputError_LibOptionsAlreadySet;
	}

	// Save options
	if(XmountLib_SplitLibParams(p_options,
	&(p_h->lib_params_count),
	&(p_h->pp_lib_params))!=0)
	{
	LOG_ERROR("Unable to parse input library options '%s'!\n",p_options);
	return e_XmountOutputError_FailedParsingOptions;
	}

	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_GetOptionsHelpText
	*/
	te_XmountOutputError XmountOutput_GetOptionsHelpText(pts_XmountOutputHandle p_h,
	char **pp_help_text)
	{
	const char *p_buf=NULL;
	char *p_help=NULL;
	int ret=0;

	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(pp_help_text==NULL) return e_XmountOutputError_InvalidBuffer;

	// Loop over all loaded libs, extract help and add to our text buffer
	// TODO: IMPROVEMENT: Final text should be sorted by lib's name
	for(uint32_t i=0;i<p_h->libs_count;i++) {
	ret=p_h->pp_libs[i]->lib_functions.OptionsHelp((const char**)&p_buf);
	if(ret!=0) {
	LOG_ERROR("Unable to get options help for library '%s': %s!\n",
	p_h->pp_libs[i]->p_name,
	p_h->pp_libs[i]->lib_functions.GetErrorMessage(ret));
	}
	if(p_buf==NULL) continue;
	XMOUNT_STRAPP(p_help," - ");
	XMOUNT_STRAPP(p_help,p_h->pp_libs[i]->p_name);
	XMOUNT_STRAPP(p_help,"\n");
	XMOUNT_STRAPP(p_help,p_buf);
	XMOUNT_STRAPP(p_help,"\n");
	ret=p_h->pp_libs[i]->lib_functions.FreeBuffer(p_buf);
	if(ret!=0) {
	LOG_ERROR("Unable to free options help text from library '%s': %s!\n",
	p_h->pp_libs[i]->p_name,
	p_h->pp_libs[i]->lib_functions.GetErrorMessage(ret));
	}
	}

	*pp_help_text=p_help;
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_GetLibsInfoText
	*/
	te_XmountOutputError XmountOutput_GetLibsInfoText(pts_XmountOutputHandle p_h,
	- char **pp_info_text)
	+ char **pp_info_text)
	{
	char *p_buf=NULL;
	char *p_info_text=NULL;
	uint8_t first=0;

	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(pp_info_text==NULL) return e_XmountOutputError_InvalidBuffer;

	// Loop over all loaded libs, extract name and supported formats and add to
	// our text buffer
	// TODO: IMPROVEMENT: Final text should be sorted by lib's name
	for(uint32_t i=0;i<p_h->libs_count;i++) {
	XMOUNT_STRAPP(p_info_text," - ");
	XMOUNT_STRAPP(p_info_text,p_h->pp_libs[i]->p_name);
	XMOUNT_STRAPP(p_info_text," supporting ");
	XMOUNT_STRAPP(p_info_text," - ");
	XMOUNT_STRAPP(p_info_text," - ");
	- p_buf=p_h->pp_libs[i]->p_supported_input_types;
	+ p_buf=p_h->pp_libs[i]->p_supported_output_types;
	first=1;
	while(*p_buf!='\0') {
	if(first==1) {
	XMOUNT_STRAPP(p_info_text,"\"");
	XMOUNT_STRAPP(p_info_text,p_buf);
	XMOUNT_STRAPP(p_info_text,"\"");
	first=0;
	} else {
	XMOUNT_STRAPP(p_info_text,", \"");
	XMOUNT_STRAPP(p_info_text,p_buf);
	XMOUNT_STRAPP(p_info_text,"\"");
	}
	p_buf+=(strlen(p_buf)+1);
	}
	XMOUNT_STRAPP(p_info_text,"\n");
	}

	*pp_info_text=p_info_text;
	return e_XmountOutputError_None;
	}

	+/*
	+ * XmountOutput_SetType
	+ */
	+te_XmountOutputError XmountOutput_SetType(pts_XmountOutputHandle p_h,
	+ char *p_format)
	+{
	+ // TODO: Implement
	+ return e_XmountOutputError_None;
	+}
	+
	/*
	* XmountOutput_Open
	*/
	te_XmountOutputError XmountOutput_Open(pts_XmountOutputHandle p_h) {
	-
	+ // TODO: Implement
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_Close
	*/
	te_XmountOutputError XmountOutput_Close(pts_XmountOutputHandle p_h) {
	-
	+ // TODO: Implement
	return e_XmountOutputError_None;
	}

	+/*
	+ * XmountOutput_GetOutputFilenames
	+ */
	+te_XmountOutputError
	+ XmountOutput_GetOutputFilenames(pts_XmountOutputHandle p_h,
	+ char ***ppp_output_files);
	+
	/*
	* XmountOutput_GetSize
	*/
	te_XmountOutputError XmountOutput_GetSize(pts_XmountOutputHandle p_h,
	- uint64_t image_nr,
	- uint64_t *p_size)
	+ const char *p_output_filename,
	+ uint64_t *p_size)
	{
	/*
	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(image_nr>=p_h->images_count) return e_XmountOutputError_NoSuchImage;
	if(p_size==NULL) return e_XmountOutputError_InvalidBuffer;

	*p_size=p_h->pp_images[image_nr]->size;
	*/
	+ // TODO: Implement
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_ReadData
	*/
	te_XmountOutputError XmountOutput_ReadData(pts_XmountOutputHandle p_h,
	- uint64_t image_nr,
	- char *p_buf,
	- uint64_t offset,
	- uint64_t count,
	- uint64_t *p_read)
	+ const char *p_output_filename,
	+ char *p_buf,
	+ uint64_t offset,
	+ uint64_t count,
	+ uint64_t *p_read)
	{
	+ // TODO: Implement
	+
	/*
	uint64_t to_read=0;
	int ret=0;
	int read_errno=0;
	pts_XmountOutputImage p_image=NULL;

	// Params check
	if(p_h==NULL) return e_XmountOutputError_InvalidHandle;
	if(image_nr>=p_h->images_count) return e_XmountOutputError_NoSuchImage;
	if(p_buf==NULL) return e_XmountOutputError_InvalidBuffer;
	p_image=p_h->pp_images[image_nr];

	LOG_DEBUG("Reading %zu bytes at offset %zu from input image '%s'\n",
	count,
	offset,
	p_image->pp_files[0]);

	// Make sure we aren't reading past EOF of image file
	if(offset>=p_image->size) {
	// Offset is beyond image size
	LOG_DEBUG("Offset %zu is at / beyond size of input image '%s'\n",
	offset,
	p_image->pp_files[0]);
	*p_read=0;
	return 0;
	}
	if(offset+count>p_image->size) {
	// Attempt to read data past EOF of image file
	to_read=p_image->size-offset;
	LOG_DEBUG("Attempt to read data past EOF of input image '%s'. "
	"Correcting size from %zu to %zu\n",
	p_image->pp_files[0],
	count,
	to_read);
	} else to_read=count;

	// Read data from image file (adding input image offset if one was specified)
	ret=p_image->p_functions->Read(p_image->p_handle,
	p_buf,
	offset+p_h->image_offset,
	to_read,
	p_read,
	&read_errno);
	if(ret!=0) {
	LOG_ERROR("Couldn't read %zu bytes at offset %zu from input image "
	"'%s': %s: Error code %u!\n",
	to_read,
	offset,
	p_image->pp_files[0],
	p_image->p_functions->GetErrorMessage(ret),
	read_errno);
	return e_XmountOutputError_FailedReadingData;
	}
	*/
	+
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_WriteData
	*/
	te_XmountOutputError XmountOutput_WriteData(pts_XmountOutputHandle p_h,
	- uint64_t image_nr,
	- const char *p_buf,
	- uint64_t offset,
	- uint64_t count)
	+ const char *p_output_filename,
	+ const char *p_buf,
	+ uint64_t offset,
	+ uint64_t count)
	{
	// TODO: Implement
	return e_XmountOutputError_None;
	}

	/*
	* XmountOutput_GetInfoFileContent
	*/
	te_XmountOutputError XmountOutput_GetInfoFileContent(pts_XmountOutputHandle p_h,
	char **pp_content)
	{
	char *p_content=NULL;

	+ // TODO: Implement
	+
	*pp_content=p_content;
	return e_XmountOutputError_None;
	}

	/*******************************************************************************
	* Private functions implementations
	******************************************************************************/
	/*
	* FindOutputLib
	*/
	te_XmountOutputError XmountOutput_FindLib(pts_XmountOutputHandle p_h,
	pts_XmountOutputImage p_input_image)
	{
	+ // TODO: Implement
	+
	// No library supporting input type found
	return e_XmountOutputError_UnsupportedFormat;
	}






	//! Get size of output image
	/*!
	* \param p_size Pointer to an uint64_t to which the size will be written to
	* \return TRUE on success, FALSE on error
	*/
	/*
	int GetOutputImageSize(uint64_t *p_size) {
	int ret;
	uint64_t output_image_size=0;

	if(glob_xmount.output.image_size!=0) {
	*p_size=glob_xmount.output.image_size;
	return TRUE;
	}

	ret=glob_xmount.output.p_functions->Size(glob_xmount.output.p_handle,
	&output_image_size);
	if(ret!=0) {
	LOG_ERROR("Couldn't get output image size!\n")
	return FALSE;
	}

	glob_xmount.output.image_size=output_image_size;
	*p_size=output_image_size;
	return TRUE;
	}
	*/

	//! Read data from output image
	/*!
	* \param p_buf Pointer to buffer to write read data to
	* \param offset Offset at which data should be read
	* \param size Size of data which should be read
	* \return Number of read bytes on success or negated error code on error
	*/
	/*
	int ReadOutputImageData(char *p_buf, off_t offset, size_t size) {
	uint64_t output_image_size;
	size_t read=0;
	int ret;

	// Get output image size
	if(GetOutputImageSize(&output_image_size)!=TRUE) {
	LOG_ERROR("Couldn't get size of output image!\n")
	return -EIO;
	}

	// Make sure request is within output image
	if(offset>=output_image_size) {
	LOG_DEBUG("Offset %zu is at / beyond size of output image.\n",offset);
	return 0;
	}
	if(offset+size>output_image_size) {
	LOG_DEBUG("Attempt to read data past EOF of output image. Correcting size "
	"from %zu to %zu.\n",
	size,
	output_image_size-offset);
	size=output_image_size-offset;
	}

	// Read data
	ret=glob_xmount.output.p_functions->Read(glob_xmount.output.p_handle,
	p_buf,
	offset,
	size,
	&read);
	if(ret!=0) {
	LOG_ERROR("Unable to read %zu bytes at offset %zu from output image!\n",
	size,
	offset)
	return ret;
	} else if(read!=size) {
	LOG_WARNING("Unable to read all requested data from output image!\n")
	return read;
	}

	return size;
	}
	*/

	//! Write data to output image
	/*!
	* \param p_buf Buffer with data to write
	* \param offset Offset to write to
	* \param size Amount of bytes to write
	* \return Number of written bytes on success or "-1" on error
	*/
	/*
	int WriteOutputImageData(const char *p_buf, off_t offset, size_t size) {
	uint64_t output_image_size;
	int ret;
	size_t written;

	// Get output image size
	if(!GetOutputImageSize(&output_image_size)) {
	LOG_ERROR("Couldn't get output image size!\n")
	return -1;
	}

	// Make sure write is within output image
	if(offset>=output_image_size) {
	LOG_ERROR("Attempt to write beyond EOF of output image file!\n")
	return -1;
	}
	if(offset+size>output_image_size) {
	LOG_DEBUG("Attempt to write past EOF of output image file. Correcting size "
	"from %zu to %zu.\n",
	size,
	output_image_size-offset);
	size=output_image_size-offset;
	}

	ret=glob_xmount.output.p_functions->Write(glob_xmount.output.p_handle,
	p_buf,
	offset,
	size,
	&written);
	if(ret!=0) {
	LOG_ERROR("Unable to write %zu bytes at offset %zu to output image!\n",
	offset,
	size)
	return ret;
	} else if(written!=size) {
	LOG_WARNING("Unable to write all requested data to output image!\n")
	}

	return size;
	}
	*/
	diff --git a/src/xmount_output.h b/src/xmount_output.h
	index e65585f..6f7f3de 100644
	--- a/src/xmount_output.h
	+++ b/src/xmount_output.h
	@@ -1,334 +1,353 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2016 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* 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 3 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, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#ifndef XMOUNT_OUTPUT_H
	#define XMOUNT_OUTPUT_H

	/*******************************************************************************
	* Public definitions / macros
	******************************************************************************/
	//! Naming scheme of morphing libraries
	#define XMOUNT_OUTPUT_LIBRARY_NAMING_SCHEME "libxmount_output_"

	/*******************************************************************************
	* Public types / structures / enums
	******************************************************************************/
	//! Output handle
	typedef struct s_XmountOutputHandle *pts_XmountOutputHandle;

	/*!
	* \brief Function to get the size of the morphed data
	*
	* Function to get the size of the morphed data
	*
	* \param image Image number
	* \param p_size Pointer to store input image's size to
	* \return 0 on success
	*/
	-typedef int (tfun_XmountOutput_InputImageSize)(uint64_t image, uint64_t p_size);
	+typedef int (*tfun_XmountOutput_InputImageSize)(uint64_t image,
	+ uint64_t *p_size);

	//! Function to read data from input image
	/*!
	* \param image Image number
	* \param p_buf Buffer to store read data to
	* \param offset Position at which to start reading
	* \param count Amount of bytes to read
	* \param p_read Number of read bytes on success
	* \return 0 on success or negated error code on error
	*/
	typedef int (*tfun_XmountOutput_InputImageRead)(uint64_t image,
	- char *p_buf,
	- off_t offset,
	- size_t count,
	- size_t *p_read);
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read);

	//! Function to write data to input image
	/*!
	* \param image Image number
	* \param p_buf Buffer to store read data to
	* \param offset Position at which to start reading
	* \param count Amount of bytes to read
	* \param p_read Number of read bytes on success
	* \return 0 on success or negated error code on error
	*/
	typedef int (*tfun_XmountOutput_InputImageWrite)(uint64_t image,
	- char *p_buf,
	- off_t offset,
	- size_t count,
	- size_t *p_written);
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_written);

	typedef enum e_XmountOutputError {
	//! No error
	e_XmountOutputError_None=0,
	//! Error to allocate memory
	e_XmountOutputError_Alloc,
	//! Invalid morphing handle
	e_XmountOutputError_InvalidHandle,
	//! Invalid pointer to a morphing handle
	e_XmountOutputError_InvalidHandlePointer,
	//! A given buffer is invalid
	e_XmountOutputError_InvalidBuffer,
	//! A given string is invalid
	e_XmountOutputError_InvalidString,
	/*
	//! Library options have already been set
	e_XmountMorphError_LibOptionsAlreadySet,
	//! Library options couldn't be parsed
	e_XmountMorphError_FailedParsingOptions,
	//! Unable to get info file content from library
	e_XmountMorphError_FailedGettingInfoFileContent,
	//! Unable to load library file
	e_XmountMorphError_FailedLoadingLibrary,
	//! Unable to load a library symbol
	e_XmountMorphError_FailedLoadingSymbol,
	//! Library has wrong API version
	e_XmountMorphError_WrongLibraryApiVersion,
	//! Library is missing a function
	e_XmountMorphError_MissingLibraryFunction,
	//! Unsupported morphing type
	e_XmountMorphError_UnsupportedType,
	//! Unable to create morphing image handle
	e_XmountMorphError_FailedCreatingMorphHandle,
	//! Unable to parse morphing library options
	e_XmountMorphError_FailedParsingLibParams,
	//! Unable to get image size
	e_XmountMorphError_FailedGettingImageSize,
	//! A specified offset is larger than the image
	e_XmountMorphError_OffsetExceedsImageSize,
	//! Unable to read data from morphed image
	e_XmountMorphError_FailedReadingData
	*/
	} te_XmountOutputError;

	/*******************************************************************************
	* Public functions declarations
	******************************************************************************/
	/*!
	- * \brief Create new morphing handle
	+ * \brief Create new output handle
	*
	- * Creates a new morphing handle.
	+ * Creates a new output handle.
	*
	- * \param pp_h Pointer to morphing handle
	+ * \param pp_h Pointer to output handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError
	XmountOutput_CreateHandle(pts_XmountOutputHandle *pp_h,
	tfun_XmountOutput_InputImageSize p_img_size,
	tfun_XmountOutput_InputImageRead p_img_read,
	tfun_XmountOutput_InputImageWrite p_img_write);

	/*!
	- * \brief Destroy morphing handle
	+ * \brief Destroy output handle
	*
	* Invalidates the given handle and frees all used resources.
	*
	- * \param pp_h Pointer to morphing handle
	+ * \param pp_h Pointer to output handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_DestroyHandle(pts_XmountOutputHandle *pp_h);

	/*!
	* \brief Enable internal debugging
	*
	* Enables the generation of intrernal debugging messages.
	*
	* \param p_h Output handle
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_EnableDebugging(pts_XmountOutputHandle p_h);

	/*!
	- * \brief Load a morphing library
	+ * \brief Load an output library
	*
	- * Loads a given morphing library.
	+ * Loads a given output library.
	*
	* \param p_h Output handle
	* \param p_lib Library name (without path)
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_AddLibrary(pts_XmountOutputHandle p_h,
	const char *p_lib_name);

	/*!
	- * \brief Get loaded morphing library count
	+ * \brief Get loaded output library count
	*
	- * Returns the number of successfully loaded morphing libraries.
	+ * Returns the number of successfully loaded output libraries.
	*
	* \param p_h Output handle
	* \param p_count Library count is returned in this variable
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_GetLibraryCount(pts_XmountOutputHandle p_h,
	uint32_t *p_count);

	/*!
	- * \brief Return all supported morphing types
	+ * \brief Return all supported output formats
	*
	- * Returns a null-terminated vector of all supported morphing types.
	+ * Returns a null-terminated vector of all supported output formats.
	*
	* The returned vector must be freed by the caller.
	*
	* \param p_h Output handle
	- * \param pp_types Supported types vector is returned in this var
	+ * \param pp_types Supported formats vector is returned in this var
	* \return e_XmountMorphError_None on success
	*/
	-te_XmountOutputError XmountOutput_GetSupportedTypes(pts_XmountOutputHandle p_h,
	- char **pp_types);
	+te_XmountOutputError
	+ XmountOutput_GetSupportedFormats(pts_XmountOutputHandle p_h,
	+ char **pp_formats);

	/*!
	* \brief Set library options
	*
	- * Parses the given library option string (as given after --inopts).
	+ * Parses the given library option string (as given after --outopts).
	*
	* \param p_h Output handle
	* \param p_options Library option string
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_SetOptions(pts_XmountOutputHandle p_h,
	char *p_options);

	/*!
	* \brief Return all library specific option help texts
	*
	- * Returns a string containing help messages for all loaded morphing lib
	+ * Returns a string containing help messages for all loaded output lib
	* options. The string is pre-formated to be used in xmount's help output.
	*
	* The caller must free the returned string.
	*
	* \param p_h Output handle
	* \param pp_help_text Help text is returned in this parameter
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_GetOptionsHelpText(pts_XmountOutputHandle p_h,
	- char **pp_help_text);
	+ char **pp_help_text);

	/*!
	* \brief Returns a string containing infos about loaded libs
	*
	- * Returns a string containing infos about loaded morphing libraries. The
	+ * Returns a string containing infos about loaded output libraries. The
	* string is pre-formated to be used in xmount's info output.
	*
	* The caller must free the returned string.
	*
	* \param p_h Output handle
	* \param pp_info_text Info text is returned in this parameter
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_GetLibsInfoText(pts_XmountOutputHandle p_h,
	- char **pp_info_text);
	+ char **pp_info_text);

	/*!
	- * \brief Set morphing type
	+ * \brief Set output format
	*
	- * Set the morphing type that should be applied to the input image.
	+ * Set the output format.
	*
	* \param p_h Output handle
	- * \param p_type Output type string as specified with xmount's --morph option.
	+ * \param p_type Output format string as specified with xmount's --out option.
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_SetType(pts_XmountOutputHandle p_h,
	- char *p_type);
	+ char *p_format);

	/*!
	- * \brief Start the morphing process
	+ * \brief Generate output image
	*
	- * Begins the morphing process.
	+ * Gets the output image ready for usage.
	*
	* \param p_h Output handle
	* \return e_XmountMorphError_None on success
	*/
	-te_XmountOutputError XmountOutput_StartOutput(pts_XmountOutputHandle p_h);
	+te_XmountOutputError XmountOutput_Open(pts_XmountOutputHandle p_h);

	/*!
	- * \brief Stop the morphing process
	+ * \brief Destroy output image
	*
	- * Ends the morphing process.
	+ * Frees what was necessary to use the output image.
	*
	* \param p_h Output handle
	* \return e_XmountMorphError_None on success
	*/
	-te_XmountOutputError XmountOutput_StopOutput(pts_XmountOutputHandle p_h);
	+te_XmountOutputError XmountOutput_Close(pts_XmountOutputHandle p_h);

	/*!
	- * \brief Get the size of the morphed image
	+ * \brief Returns an array containing all output files names
	*
	- * Returns the size (in bytes) of the morphed image.
	+ * TODO: Describe
	*
	* \param p_h Output handle
	- * \param image_nr Image number for which to return the size
	+ * \return e_XmountMorphError_None on success
	+ */
	+te_XmountOutputError
	+ XmountOutput_GetOutputFilenames(pts_XmountOutputHandle p_h,
	+ char ***ppp_output_files);
	+
	+/*!
	+ * \brief Get the size of the output image
	+ *
	+ * Returns the size (in bytes) of the specified output image.
	+ *
	+ * \param p_h Output handle
	+ * \param p_output_filename Output file for which to return the size
	* \param p_size On success, size is returned in this variable
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_GetSize(pts_XmountOutputHandle p_h,
	- uint64_t *p_size);
	+ const char *p_output_filename,
	+ uint64_t *p_size);

	/*!
	- * \brief Read data from the morphed image
	+ * \brief Read data from an output image
	*
	- * Reads count bytes from the morphed image starting at given offset and
	- * copies the data into p_buf.
	+ * Reads count bytes from the specified output image starting at given offset
	+ * and copies the data into p_buf.
	*
	* The given buffer must be pre-allocated to hold as many bytes as should be
	* read!
	*
	* \param p_h Output handle
	+ * \param p_output_filename Output file for which to return the size
	* \param p_buf Buffer into which to copy read data
	* \param offset Offset at which to start reading
	* \param count Amount of bytes to read
	* \param p_read On success, amount of bytes read is returned in this variable
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_ReadData(pts_XmountOutputHandle p_h,
	- char *p_buf,
	- uint64_t offset,
	- uint64_t count,
	- uint64_t *p_read);
	+ const char *p_output_filename,
	+ char *p_buf,
	+ uint64_t offset,
	+ uint64_t count,
	+ uint64_t *p_read);

	/*!
	- * \brief Writes data to the morphed image
	+ * \brief Writes data to an output image
	*
	- * Writes count bytes from p_buf to the morphed image starting at the given
	- * offset.
	+ * Writes count bytes from p_buf to the specified output image starting at the
	+ * given offset.
	*
	* \param p_h Output handle
	+ * \param p_output_filename Output file for which to return the size
	* \param p_buf Buffer with data to write
	* \param offset Offset at which to start writing
	* \param count Amount of bytes to write
	* \param p_written On success, amount of bytes written is returned here
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_WriteData(pts_XmountOutputHandle p_h,
	- const char *p_buf,
	- uint64_t offset,
	- uint64_t count,
	- uint64_t *p_written);
	+ const char *p_output_filename,
	+ const char *p_buf,
	+ uint64_t offset,
	+ uint64_t count,
	+ uint64_t *p_written);

	/*!
	* \brief Get info text to be added to xmount's info file
	*
	- * Generates a string containing informations about the currently morphed image.
	+ * Generates a string containing informations about the output image.
	*
	* The caller must free the returned string.
	*
	* \param p_h Output handle
	* \param pp_content Buffer in which text is returned
	* \return e_XmountMorphError_None on success
	*/
	te_XmountOutputError XmountOutput_GetInfoFileContent(pts_XmountOutputHandle p_h,
	- char **pp_content);
	+ char **pp_content);

	#endif // XMOUNT_OUTPUT_H

File Metadata

Mime Type: text/x-diff
Expires: Mon, Dec 23, 11:24 AM (8 h, 41 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1176888
Default Alt Text: (56 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions