Ignore:
Timestamp:
Mar 9, 2012, 10:12:14 AM (12 years ago)
Author:
ldelgass
Message:

Refactor texture classes, misc. cleanups, cut down on header pollution -- still
need to fix header deps in Makefile.in

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/vizservers/nanovis/imgLoaders/ImageLoader.cpp

    r2798 r2831  
    11/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
     2#include <stdio.h>
     3
     4#include <map>
     5#include <string>
     6
    27#include "ImageLoader.h"
    38#include "ImageLoaderImpl.h"
    4 #include <map>
    5 #include <string>
    6 #include <stdio.h>
    79
    8 ImageLoader::ImageLoader()
    9     : _loaderImpl(0)
     10ImageLoader::ImageLoader() :
     11    _loaderImpl(NULL)
    1012{
    1113}
    1214
    13 Image* ImageLoader::load(const char* fileName)
     15Image *ImageLoader::load(const char* fileName, const Image::ImageFormat format)
    1416{
    15     if (_loaderImpl)
    16     {
    17         _loaderImpl->_targetImageFormat = Image::IMG_RGB;
    18         return _loaderImpl->load(fileName);
    19     }
    20    
    21     return 0;
    22 }
    23 
    24 Image* ImageLoader::load(const char* fileName, const Image::ImageFormat format)
    25 {
    26     if (_loaderImpl)
    27     {
     17    if (_loaderImpl) {
    2818        _loaderImpl->_targetImageFormat = format;
    2919        return _loaderImpl->load(fileName);
    3020    }
    31    
     21
    3222    return 0;
    3323}
    34 
    35 
Note: See TracChangeset for help on using the changeset viewer.