ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
42 lines
1.2 KiB
Objective-C
Executable File
42 lines
1.2 KiB
Objective-C
Executable File
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#ifndef SkStream_NSData_DEFINED
|
|
#define SkStream_NSData_DEFINED
|
|
|
|
#import <UIKit/UIKit.h>
|
|
#include "SkStream.h"
|
|
|
|
/** Returns an NSData with a copy of the stream's data. The caller must call
|
|
retain if it intends to keep the data object beyond the current stack-frame
|
|
(i.e. internally we're calling [NSData dataWithBytes...]
|
|
*/
|
|
NSData* NSData_dataWithStream(SkStream* stream);
|
|
|
|
/** Returns an NSData from the named resource (from main bundle).
|
|
The caller must call retain if it intends to keep the data object beyond
|
|
the current stack-frame
|
|
(i.e. internally we're calling [NSData dataWithContentsOfMappedFile...]
|
|
*/
|
|
NSData* NSData_dataFromResource(const char name[], const char suffix[]);
|
|
|
|
/** Wrap a stream around NSData.
|
|
*/
|
|
class SkStream_NSData : public SkMemoryStream {
|
|
public:
|
|
SkStream_NSData(NSData* data);
|
|
virtual ~SkStream_NSData();
|
|
|
|
static SkStream_NSData* CreateFromResource(const char name[],
|
|
const char suffix[]);
|
|
|
|
private:
|
|
NSData* fNSData;
|
|
};
|
|
|
|
#endif
|