Files
UnrealEngineUWP/Engine/Source/Runtime/ImageWrapper/Private/PngImageWrapper.cpp

498 lines
13 KiB
C++
Raw Normal View History

// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3209340) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3209340 on 2016/11/23 by Ben.Marsh Convert UE4 codebase to an "include what you use" model - where every header just includes the dependencies it needs, rather than every source file including large monolithic headers like Engine.h and UnrealEd.h. Measured full rebuild times around 2x faster using XGE on Windows, and improvements of 25% or more for incremental builds and full rebuilds on most other platforms. * Every header now includes everything it needs to compile. * There's a CoreMinimal.h header that gets you a set of ubiquitous types from Core (eg. FString, FName, TArray, FVector, etc...). Most headers now include this first. * There's a CoreTypes.h header that sets up primitive UE4 types and build macros (int32, PLATFORM_WIN64, etc...). All headers in Core include this first, as does CoreMinimal.h. * Every .cpp file includes its matching .h file first. * This helps validate that each header is including everything it needs to compile. * No engine code includes a monolithic header such as Engine.h or UnrealEd.h any more. * You will get a warning if you try to include one of these from the engine. They still exist for compatibility with game projects and do not produce warnings when included there. * There have only been minor changes to our internal games down to accommodate these changes. The intent is for this to be as seamless as possible. * No engine code explicitly includes a precompiled header any more. * We still use PCHs, but they're force-included on the compiler command line by UnrealBuildTool instead. This lets us tune what they contain without breaking any existing include dependencies. * PCHs are generated by a tool to get a statistical amount of coverage for the source files using it, and I've seeded the new shared PCHs to contain any header included by > 15% of source files. Tool used to generate this transform is at Engine\Source\Programs\IncludeTool. [CL 3209342 by Ben Marsh in Main branch]
2016-11-23 15:48:37 -05:00
#include "PngImageWrapper.h"
#include "Misc/ScopeLock.h"
#include "ImageWrapperPrivate.h"
#if WITH_UNREALPNG
// Disable warning "interaction between '_setjmp' and C++ object destruction is non-portable"
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3232619) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3121996 on 2016/09/12 by Ben.Marsh Add support for Visual Studio 2017 (aka "15"; assuming consistent naming with other versions until final name is announced). * Compiler, STL implementation and CRT are binary compatible with VS2015 (see https://blogs.msdn.microsoft.com/vcblog/2016/08/24/c1417-features-and-stl-fixes-in-vs-15-preview-4/), so no new third-party libraries needed so far. WindowsPlatform.GetVisualStudioCompilerVersionName() returns "2015" as a result. * Default compiler for compiling and generating project files is still VS 2015 for now. Pass -2017 on the command line to GenerateProjectFiles.bat to generate VS2017 projects. Projects generated for VS2017 will use the 2017 compiler by default. * Visual Studio source code accessor can talk to VS 2017 instances. * Added a VS2017 configuration for UnrealVS, and added precompiled vsix package. * Switched GetVSComnTools to check the SOFTWARE\Microsoft\VisualStudio\SxS\VS7 registry key rather than the individual product install registry key. "15" doesn't seem to have it's own "InstallDir" key, but this system seems to work for all versions of Visual Studio (including previous releases of VS Express). * Removed ATL dependency from VisualStudioSourceCodeAccessor. It's not installed with VS by default any more, and is only used for a couple of smart pointer classes. Tested running the editor and packaging TP_Flying for Win64. Packaging from the editor still defaults to using the 2015 compiler, so ConfigureToolchain() needs to be overriden from the .target.cs file if multiple Visual Studio versions are installed. Change 3189363 on 2016/11/07 by Ben.Marsh Consolidate functionality for determining the path to MSBuild.exe to use for compiling UE4 tools into a single batch file (GetMSBuildToolPath) and fix "Clean" not working on PS4 due to include/library paths being set to something by the Visual Studio environment. Change 3210598 on 2016/11/27 by Ben.Marsh UBT: Prevent the name of each file compiled being output twice on XboxOne. Compiler already outputs this string; the action doesn't need to. Change 3210601 on 2016/11/27 by Ben.Marsh PR #2967: Add silent version of switch game version (Contributed by EricLeeFriedman) Change 3210602 on 2016/11/27 by Ben.Marsh PR #2964: GitDependencies shouldn't try to clean up working directory files that are excluded or ignored (Contributed by joelmcginnis) Change 3210605 on 2016/11/27 by Ben.Marsh UGS: Add a warning when syncing latest would remove changes that have been authored locally. Typically happens when working with precompiled binaries. Change 3211656 on 2016/11/28 by Ben.Marsh UBT: Move ModuleRules and TargetRules into their own file. Change 3211797 on 2016/11/28 by Ben.Marsh UBT: Remove utility functions from TargetRules for checking different classes of target types. Moving TargetRules to be data-only. Change 3211833 on 2016/11/28 by Ben.Marsh UBT: Remove overridable configuration name from target rules. This feature is not used anywhere. Change 3211859 on 2016/11/28 by Ben.Marsh UBT: Deprecate the GetGeneratedCodeVersion() callback in favor of a member variable instead. Change 3211942 on 2016/11/28 by Ben.Marsh UBT: Remove legacy code which tries to change the output paths for console binaries. Output paths for monolithic binaries are always in the project folder now. Change 3215333 on 2016/11/30 by Ben.Marsh UBT: Replace the GetSupportedPlatforms() callback on TargetRules with a SupportedPlatforms attribute. Since a TargetRules object can only be instantiated with an actual platform, it doesn't make sense for it to be an instance method. Change 3215482 on 2016/11/30 by Ben.Marsh UBT: Remove the GetSupportedConfigurations() callback on the TargetRules class. A configuration is required to construct a TargetRules instance, so it doesn't make sense to need to call an instance method to find out which configurations are supported. Change 3215743 on 2016/11/30 by Ben.Marsh UBT: Deprecate the TargetRules.ShouldCompileMonolithic() function: this function requires access to the global command line to operate correctly, which prevents creating target-specific instances, and does not use the platform/configuration passed into the TargetRules constructor. Rather than being a callback, the LinkType field can now be set to TargetLinkType.Modular or TargetLinkType.Monolithic from the constructor as appropriate. The default value (TargetLinkType.Default) results in the default link type for the target type being used. Parsing of the command-line overrides is now done when building the TargetDescriptor. Change 3215778 on 2016/11/30 by Ben.Marsh UBT: Mark overrides of the TargetRules.GetModulesToPrecompile method as obsolete. Change 3217681 on 2016/12/01 by Ben.Marsh UAT: Prevent UE4Build deleting .modules files when running with the -Clean argument; these files are artifacts generated by UBT itself, not by the exported XGE script. Change 3217723 on 2016/12/01 by Ben.Marsh UBT: Run pre- and post-build steps for all plugins that are being built, not just those that are enabled. Change 3217930 on 2016/12/01 by Ben.Marsh UGS: Add a perforce settings window, allowing users to set optional values for tuning Perforce performance on unreliable connections. Change 3218762 on 2016/12/02 by Ben.Marsh Enable warnings whenever an undefined macro is used in a constant expression inside an #if or #elif directive, and fix existing violations. Change 3219161 on 2016/12/02 by Ben.Marsh Core: Use the directory containing the current module to derive the UE4 base directory, rather than the executable directory. Allows UE4 to be hosted by a process in a different directory. Change 3219197 on 2016/12/02 by Ben.Marsh Core: When loading a DLL from disk, convert any relative paths to absolute before calling LoadLibrary. The OS resolves these paths relative to the directory containing the process executable -- not the working directory -- so paths need to be absolute to allow UE4 to be hosted by a process elsewhere. Change 3219209 on 2016/12/02 by Ben.Marsh Replace some calls to LoadLibrary() with FPlatformProcess::GetDllHandle(). The UE4 function makes sure that relative paths are resolved relative to the correct base directory, which is important when the host executable is not in Engine/Binaries/Win64. Change 3219610 on 2016/12/02 by Ben.Marsh Add the -q (quiet) option to the Mac unzip command, since it's creating too much log output to be useful. Change 3219731 on 2016/12/02 by Ben.Marsh UBT: Add option to disable IWYU checks regarding the use of monolithic headers (Engine.h, UnrealEd.h, etc...) and including the matching header for a cpp file first. bEnforceIWYU can be set to false in UEBuildConfiguration or on a per-module basis in the module rules. Change 3220796 on 2016/12/04 by Ben.Marsh Remove PrepForUATPackageOrDeploy from the UEBuildDeploy base class. It never has to be accessed through the base class anyway. Change 3220825 on 2016/12/04 by Ben.Marsh UBT: Change all executors to derive from a common base class (ActionExecutor). Change 3220834 on 2016/12/04 by Ben.Marsh UBT: Remove the global CommandLineContains() function. Change 3222706 on 2016/12/05 by Ben.Marsh Merging CL 3221949 from //UE4/Release-4.14: Fixes to code analysis template causing problems with stock install of VS2017. Change 3222712 on 2016/12/05 by Ben.Marsh Merging CL 3222021 from //UE4/Release-4.14: Change detection of MSBuild.exe path to match GetMSBuildPath.bat Change 3223628 on 2016/12/06 by Ben.Marsh Merging CL 3223369 from 4.14 branch: Use the same logic as GetMsBuildPath.bat inside FDesktopPlatformBase to determine path to MSBuild.exe Change 3223817 on 2016/12/06 by Ben.Marsh Remove non-ANSI characters from source files. Compiler/P4 support is patchy for this, and we want to avoid failing prey to different codepages resulting in different interpretations of the source text. Change 3224046 on 2016/12/06 by Ben.Marsh Remove the need for the iOS/TVOS deployment instances to have an IOSPlatformContext instance. The only dependency between the two -- a call to GetRequiredCapabilities() -- is now implemented by querying the INI file for the supported architectures when neeeded. Change 3224792 on 2016/12/07 by Ben.Marsh UBT: Touch PCH wrapper files whenever the file they include is newer rather than writing the timestamp for the included file into it as a comment. Allows use of ccache and similar tools. Change 3225212 on 2016/12/07 by Ben.Marsh UBT: Move settings required for deployment into the UEBuildDeployTarget class, allowing them to be serialized to and from a file the intermediate directory without having to construct a phony UEBuildTarget to deploy. Deployment is now performed by a method on UEBuildPlatform, rather than having to create a UEBuildPlatformContext and using that to create a UEBuildDeploy object. The -prepfordeploy UBT invocation from UAT, previously done by the per-platform PostBuildTarget() callback when building with XGE, is replaced by running UBT with a path to the serialized UEBuildDeployTarget object, and can be done in a platform agnostic manner. Change 3226310 on 2016/12/07 by Ben.Marsh PR #3015: Fixes wrong VSC++ flags being passed for .c files (Contributed by badlogic) Change 3228273 on 2016/12/08 by Ben.Marsh Update copyright notices for QAGame. Change 3229166 on 2016/12/09 by Ben.Marsh UBT: Rewritten config file parser. No longer requires hard-coded list of sections to be parsed, but parses them on demand. Measured 2x faster read speeds (largely due to eliminating construction of temporary string objects when parsing each line, to trim whitespace and so on). Also includes an attribute-driven parser, which allows reading named config values for marked up fields in an object. Change 3230601 on 2016/12/12 by Ben.Marsh Swarm: Change Swarm AgentInterface to target .NET framework 4.5, to remove dependency on having 4.0 framework installed. Change 3230737 on 2016/12/12 by Ben.Marsh UAT: Stop UE4Build deriving from CommandUtils. Confusing pattern, and causes problems trying to access instance variables that are only set for build commands. Change 3230751 on 2016/12/12 by Ben.Marsh UAT: Move ParseParam*() functions which use the instanced parameter list from CommandUtils to BuildCommand, since that's the only thing that it's instanced for. Change 3230804 on 2016/12/12 by Ben.Marsh UBT: Add the IsPromotedBuild flag to Build.version, and only set the bFormalBuild flag in UBT if it's set. This allows UGS users to avoid having to compile separate RC files for each output binary. Change 3230831 on 2016/12/12 by Ben.Marsh UGS: Warn when trying to switch streams if files are checked out. Change 3231281 on 2016/12/12 by Chad.Garyet Fixing a bug where .modules files were getting put into receipts with their absolute path instead of their relative one Change 3231496 on 2016/12/12 by Ben.Marsh Disable code analysis in CrashReportProcess; causes warnings when compiled with VS2015. Change 3231979 on 2016/12/12 by Ben.Marsh UBT: Suppress LNK4221 when generating import libraries. This can happen often when generating import libraries separately to linking. Change 3232619 on 2016/12/13 by Ben.Marsh Fix "#pragma once in main file" errors on Mac, which are occurring in //UE4/Main. [CL 3232653 by Ben Marsh in Main branch]
2016-12-13 11:58:16 -05:00
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4611)
#endif
/** Only allow one thread to use libpng at a time (it's not thread safe) */
FCriticalSection GPNGSection;
/* Local helper classes
*****************************************************************************/
/**
* Error type for PNG reading issue.
*/
struct FPNGImageCRCError
{
FPNGImageCRCError(FString InErrorText)
: ErrorText(MoveTemp(InErrorText))
{ }
FString ErrorText;
};
/**
* Guard that safely releases PNG reader resources.
*/
class PNGReadGuard
{
public:
PNGReadGuard( png_structp* InReadStruct, png_infop* InInfo )
: png_ptr(InReadStruct)
, info_ptr(InInfo)
, PNGRowPointers(NULL)
{
}
~PNGReadGuard()
{
if (PNGRowPointers != NULL)
{
png_free( *png_ptr, *PNGRowPointers );
}
png_destroy_read_struct( png_ptr, info_ptr, NULL );
}
void SetRowPointers( png_bytep** InRowPointers )
{
PNGRowPointers = InRowPointers;
}
private:
png_structp* png_ptr;
png_infop* info_ptr;
png_bytep** PNGRowPointers;
};
/**
* Guard that safely releases PNG Writer resources
*/
class PNGWriteGuard
{
public:
PNGWriteGuard( png_structp* InWriteStruct, png_infop* InInfo )
: PNGWriteStruct(InWriteStruct)
, info_ptr(InInfo)
, PNGRowPointers(NULL)
{
}
~PNGWriteGuard()
{
if (PNGRowPointers != NULL)
{
png_free( *PNGWriteStruct, *PNGRowPointers );
}
png_destroy_write_struct( PNGWriteStruct, info_ptr );
}
void SetRowPointers( png_bytep** InRowPointers )
{
PNGRowPointers = InRowPointers;
}
private:
png_structp* PNGWriteStruct;
png_infop* info_ptr;
png_bytep** PNGRowPointers;
};
/* FPngImageWrapper structors
*****************************************************************************/
FPngImageWrapper::FPngImageWrapper()
: FImageWrapperBase()
, ReadOffset( 0 )
, ColorType(0)
, Channels(0)
{ }
/* FImageWrapper interface
*****************************************************************************/
void FPngImageWrapper::Compress( int32 Quality )
{
if (!CompressedData.Num())
{
// thread safety
FScopeLock PNGLock(&GPNGSection);
check(RawData.Num());
check(Width > 0);
check(Height > 0);
// Reset to the beginning of file so we can use png_read_png(), which expects to start at the beginning.
ReadOffset = 0;
png_structp png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, this, FPngImageWrapper::user_error_fn, FPngImageWrapper::user_warning_fn );
check(png_ptr);
png_infop info_ptr = png_create_info_struct( png_ptr );
check(info_ptr);
PNGWriteGuard PNGGuard(&png_ptr, &info_ptr);
{
png_set_compression_level(png_ptr, Z_BEST_SPEED);
png_set_IHDR(png_ptr, info_ptr, Width, Height, RawBitDepth, (RawFormat == ERGBFormat::Gray) ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_RGBA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
png_set_write_fn(png_ptr, this, FPngImageWrapper::user_write_compressed, FPngImageWrapper::user_flush_data);
png_bytep* row_pointers = (png_bytep*) png_malloc( png_ptr, Height*sizeof(png_bytep) );
const uint32 PixelChannels = (RawFormat == ERGBFormat::Gray) ? 1 : 4;
const uint32 BytesPerPixel = (RawBitDepth * PixelChannels) / 8;
const uint32 BytesPerRow = BytesPerPixel * Width;
PNGGuard.SetRowPointers( &row_pointers );
for (int32 i = 0; i < Height; i++)
{
row_pointers[i]= &RawData[i * BytesPerRow];
}
png_set_rows(png_ptr, info_ptr, row_pointers);
uint32 Transform = (RawFormat == ERGBFormat::BGRA) ? PNG_TRANSFORM_BGR : PNG_TRANSFORM_IDENTITY;
// PNG files store 16-bit pixels in network byte order (big-endian, ie. most significant bits first).
#if PLATFORM_LITTLE_ENDIAN
// We're little endian so we need to swap
if (RawBitDepth == 16)
{
Transform |= PNG_TRANSFORM_SWAP_ENDIAN;
}
#endif
if (!setjmp(SetjmpBuffer))
{
png_write_png(png_ptr, info_ptr, Transform, NULL);
}
}
}
}
void FPngImageWrapper::Reset( )
{
FImageWrapperBase::Reset();
ReadOffset = 0;
ColorType = 0;
Channels = 0;
}
bool FPngImageWrapper::SetCompressed( const void* InCompressedData, int32 InCompressedSize )
{
bool bResult = FImageWrapperBase::SetCompressed( InCompressedData, InCompressedSize );
return bResult && LoadPNGHeader(); // Fetch the variables from the header info
}
void FPngImageWrapper::Uncompress( const ERGBFormat::Type InFormat, const int32 InBitDepth )
{
if( !RawData.Num() || InFormat != RawFormat || InBitDepth != RawBitDepth)
{
check( CompressedData.Num() );
UncompressPNGData( InFormat, InBitDepth );
}
}
void FPngImageWrapper::UncompressPNGData( const ERGBFormat::Type InFormat, const int32 InBitDepth )
{
// thread safety
FScopeLock PNGLock(&GPNGSection);
check( CompressedData.Num() );
check( Width > 0 );
check( Height > 0 );
// Note that PNGs on PC tend to be BGR
check( InFormat == ERGBFormat::BGRA || InFormat == ERGBFormat::RGBA || InFormat == ERGBFormat::Gray ) // Other formats unsupported at present
check( InBitDepth == 8 || InBitDepth == 16 ) // Other formats unsupported at present
// Reset to the beginning of file so we can use png_read_png(), which expects to start at the beginning.
ReadOffset = 0;
png_structp png_ptr = png_create_read_struct_2( PNG_LIBPNG_VER_STRING, this, FPngImageWrapper::user_error_fn, FPngImageWrapper::user_warning_fn, NULL, FPngImageWrapper::user_malloc, FPngImageWrapper::user_free);
check( png_ptr );
png_infop info_ptr = png_create_info_struct( png_ptr );
check( info_ptr );
#if !PLATFORM_EXCEPTIONS_DISABLED
try
#endif
{
PNGReadGuard PNGGuard( &png_ptr, &info_ptr );
{
if (ColorType == PNG_COLOR_TYPE_PALETTE)
{
png_set_palette_to_rgb(png_ptr);
}
if ((ColorType & PNG_COLOR_MASK_COLOR) == 0 && BitDepth < 8)
{
png_set_expand_gray_1_2_4_to_8(png_ptr);
}
// Insert alpha channel with full opacity for RGB images without alpha
if ((ColorType & PNG_COLOR_MASK_ALPHA) == 0 && (InFormat == ERGBFormat::BGRA || InFormat == ERGBFormat::RGBA))
{
// png images don't set PNG_COLOR_MASK_ALPHA if they have alpha from a tRNS chunk, but png_set_add_alpha seems to be safe regardless
if ((ColorType & PNG_COLOR_MASK_COLOR) == 0)
{
png_set_tRNS_to_alpha(png_ptr);
}
else if (ColorType == PNG_COLOR_TYPE_PALETTE)
{
png_set_tRNS_to_alpha(png_ptr);
}
if (InBitDepth == 8)
{
png_set_add_alpha(png_ptr, 0xff , PNG_FILLER_AFTER);
}
else if (InBitDepth == 16)
{
png_set_add_alpha(png_ptr, 0xffff , PNG_FILLER_AFTER);
}
}
// Calculate Pixel Depth
const uint32 PixelChannels = (InFormat == ERGBFormat::Gray) ? 1 : 4;
const uint32 BytesPerPixel = (InBitDepth * PixelChannels) / 8;
const uint32 BytesPerRow = BytesPerPixel * Width;
RawData.Empty(Height * BytesPerRow);
RawData.AddUninitialized(Height * BytesPerRow);
png_set_read_fn( png_ptr, this, FPngImageWrapper::user_read_compressed );
png_bytep* row_pointers = (png_bytep*) png_malloc( png_ptr, Height*sizeof(png_bytep) );
PNGGuard.SetRowPointers(&row_pointers);
for (int32 i = 0; i < Height; i++)
{
row_pointers[i]= &RawData[i * BytesPerRow];
}
png_set_rows(png_ptr, info_ptr, row_pointers);
uint32 Transform = (InFormat == ERGBFormat::BGRA) ? PNG_TRANSFORM_BGR : PNG_TRANSFORM_IDENTITY;
// PNG files store 16-bit pixels in network byte order (big-endian, ie. most significant bits first).
#if PLATFORM_LITTLE_ENDIAN
// We're little endian so we need to swap
if (BitDepth == 16)
{
Transform |= PNG_TRANSFORM_SWAP_ENDIAN;
}
#endif
// Convert grayscale png to RGB if requested
if ((ColorType & PNG_COLOR_MASK_COLOR) == 0 &&
(InFormat == ERGBFormat::RGBA || InFormat == ERGBFormat::BGRA))
{
Transform |= PNG_TRANSFORM_GRAY_TO_RGB;
}
// Convert RGB png to grayscale if requested
if ((ColorType & PNG_COLOR_MASK_COLOR) != 0 && InFormat == ERGBFormat::Gray)
{
png_set_rgb_to_gray_fixed(png_ptr, 2 /* warn if image is in color */, -1, -1);
}
// Strip alpha channel if requested output is grayscale
if (InFormat == ERGBFormat::Gray)
{
// this is not necessarily the best option, instead perhaps:
// png_color background = {0,0,0};
// png_set_background(png_ptr, &background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
Transform |= PNG_TRANSFORM_STRIP_ALPHA;
}
// Reduce 16-bit to 8-bit if requested
if (BitDepth == 16 && InBitDepth == 8)
{
#if PNG_LIBPNG_VER >= 10504
check(0); // Needs testing
Transform |= PNG_TRANSFORM_SCALE_16;
#else
Transform |= PNG_TRANSFORM_STRIP_16;
#endif
}
// Increase 8-bit to 16-bit if requested
if (BitDepth <= 8 && InBitDepth == 16)
{
#if PNG_LIBPNG_VER >= 10504
check(0); // Needs testing
Transform |= PNG_TRANSFORM_EXPAND_16;
#else
// Expanding 8-bit images to 16-bit via transform needs a libpng update
check(0);
#endif
}
if (!setjmp(SetjmpBuffer))
{
png_read_png(png_ptr, info_ptr, Transform, NULL);
}
}
}
#if !PLATFORM_EXCEPTIONS_DISABLED
catch (const FPNGImageCRCError& e)
{
/**
* libPNG has a known issue in version 1.5.2 causing
* an unhandled exception upon a CRC error. This code
* catches our custom exception thrown in user_error_fn.
*/
UE_LOG(LogImageWrapper, Error, TEXT("%s"), *e.ErrorText);
}
#endif
RawFormat = InFormat;
RawBitDepth = InBitDepth;
}
/* FPngImageWrapper implementation
*****************************************************************************/
bool FPngImageWrapper::IsPNG() const
{
check( CompressedData.Num() );
const int32 PNGSigSize = sizeof(png_size_t);
if (CompressedData.Num() > PNGSigSize)
{
png_size_t PNGSignature = *reinterpret_cast<const png_size_t*>(CompressedData.GetData());
return (0 == png_sig_cmp(reinterpret_cast<png_bytep>(&PNGSignature), 0, PNGSigSize));
}
return false;
}
bool FPngImageWrapper::LoadPNGHeader()
{
check(CompressedData.Num());
// Test whether the data this PNGLoader is pointing at is a PNG or not.
if (IsPNG())
{
// thread safety
FScopeLock PNGLock(&GPNGSection);
png_structp png_ptr = png_create_read_struct_2( PNG_LIBPNG_VER_STRING, this, FPngImageWrapper::user_error_fn, FPngImageWrapper::user_warning_fn, NULL, FPngImageWrapper::user_malloc, FPngImageWrapper::user_free );
check(png_ptr);
png_infop info_ptr = png_create_info_struct( png_ptr );
check(info_ptr);
PNGReadGuard PNGGuard(&png_ptr, &info_ptr);
{
png_set_read_fn(png_ptr, this, FPngImageWrapper::user_read_compressed);
png_read_info(png_ptr, info_ptr);
Width = info_ptr->width;
Height = info_ptr->height;
ColorType = info_ptr->color_type;
BitDepth = info_ptr->bit_depth;
Channels = info_ptr->channels;
Format = (ColorType & PNG_COLOR_MASK_COLOR) ? ERGBFormat::RGBA : ERGBFormat::Gray;
}
return true;
}
return false;
}
/* FPngImageWrapper static implementation
*****************************************************************************/
Copying //UE4/Portal-Staging to Dev-Main (//UE4/Dev-Main) (Source: //Portal/Main @ 3352026) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 3351920 on 2017/03/17 by Leigh.Swift #jira OPP-6870: [Crash] Assertion failed: ctx->ReadOffset + length <= (uint32)ctx->CompressedData.Num() [File:D:\Build\++Portal+Release-Live+Compile\Sync\Engine\Source\Runtime\ImageWrapper\Private\PngImageWrapper.cpp] [Line: 420] Instead of asserting for an incorrect data size for png image being loaded, set an error on the wrapper object. This will result in the slate brush rendering as white box, and errors going to the log which include the png resource path. Change 3350561 on 2017/03/16 by Justin.Sargent Updated the Slate standalone D3D renderer to be more fault tolerant. Added new HasLostDevice() function to SlateRenderer. If the launcher detects that it has lost the device context it will attempt to perform a full rebuild of the UI and Presentation layers, but also a full reboot of slate application and the renderer. The launcher will attempt to re-establish the device context for 5 minutes if not interrupted by the user. If the user interacts with the launcher while attempting to re-establish the device context it will instead pop up a system dialog explaining it is having issues with the video card and then will close the application. Change 3341299 on 2017/03/10 by Richard.Fawcett Validate JSON files as we're pushing to EMS Added a flexible validation framework to the system files (EMS) sync operation. Implemented a JSON validator which by default will validate .json files. Adds a "ValidationRules" property to the EMS sync config file to allow each product to define its own regex patterns for filenames which should be validated with each validator. Configured launcher's EMS to validate .product, .v?product, .layout, .sdmeta and .panel files as JSON. The great news is that this validation actually discovered a minor syntactical issue with Wex.v2product during testing, which is also fixed with this submission. \o/ #epicfriday Change 3336908 on 2017/03/08 by Leigh.Swift #jira OPP-5126: All disk size checks for BPS installations should be handled internally to BPS, the Portal code should not need to check this and can only do so less accurately. Removing disk space checks from portal code which block installers from running. NB: There is still a check in selective download code which provides tooltip information only. Moving BuildPatchInstaller disk size check to the file constructor, which is the class that most accurately knows the required amount of space. The disk check now occurs after resume and just before we start to write data. A secondary disk check is also made if a file fails to construct so that we can detect problems caused by change in available disk space. Disk space error message extended to include useful information for the user. Change 3323366 on 2017/02/27 by Richard.Fawcett Fix reference to Newtonsoft in Publishing.Automation. Change 3323205 on 2017/02/27 by Wes.Fudala Adding language support to the windows installer. Significantly expandes OneSky upload functionality. OPP-5438 Launcher installer should support the same language set supported by the launcher. Change 3316926 on 2017/02/22 by Richard.Fawcett Prevent Amazon S3 download glitches from issuing warnings until half of the maximum retries have been attempted. In practice, when we download thousands of files, we _do_ get failures which need to be retried. This means that pretty much all jobs result in warnings, which isn't appropriate. This should turn jobs green again, and only warn us when things look unusual. #jira OPP-6607 Change 3315996 on 2017/02/21 by Justin.Sargent Incrementing Portal version number I'm incrementing this earlier than normal due to a need to depend on a new version number for EMS layout change versioning. Change 3312760 on 2017/02/20 by Wes.Fudala Users can now select desired environment/region from the UI. New login screen. Adds slid out settings menu to login screen. Adds region and language selection to the settings menu. Adds support for PortalRegions ini. Adds DefaultPortalRegions ini. Adds RegionRepository, RegionPublisher, RegionSelectService, and RegionIdentificationService. Adds region select option in debugtools general section. Adds RegionSelectService unit test with associated mocks. Changes the way all backend connections are configured so that values are now pulled from config files. Renames product region selector files to avoid some confusion with portal region files. Updated EmsConfigUpdater and HotfixManager so they support optional overwrite and save of ini files. Region publisher now restricts regions that require permissions in shipping builds. Fixes a bug causing items to get stuck in the download queue UI after we failed to obtain a manifest when reaching out the the backend. #jira OPP-6121, OPP-5809 Change 3311664 on 2017/02/20 by Andrew.Brown Added GetTypeHash support for FDelegateHandle Change 3311505 on 2017/02/20 by Richard.Fawcett Rename/move file(s) Change 3309004 on 2017/02/17 by Chad.Garyet adding in additional platforms for the BuildPlugin commandline Change 3299188 on 2017/02/13 by Leigh.Swift #jira OPP-6711: [CRASH] Assertion failed: IsComplete() Race condition in portal hack allowed an installer to attempt to execute complete delegate before being complete. Change 3294197 on 2017/02/09 by Richard.Fawcett Adding ValidPrereqIds.json This is needed now because the script to enforce correct prereq ids reaches out to Perforce to access this file! #jira OPP-6583 Change 3294059 on 2017/02/09 by Richard.Fawcett Fix comment on PostBuild parameter to reference correct name of "Manifest" property. Change 3293377 on 2017/02/08 by Richard.Fawcett Remove need for a metadata file containing name of generated manifest when using randomized manifest filenames. Change 3282865 on 2017/02/02 by Richard.Fawcett Simplify params to BuildGraph's ChunkTask / PostBuildTask Also, downgrade warnings to simple log messages when falling back to legacy manifest filename construction to ease transition into randomized manifest filenames for game teams. #jira OPP-6435 Change 3282809 on 2017/02/02 by Leigh.Swift #jira OPP-6564: BPT will crash if the FileIgnoreList input instructs the build streamer to ignore every build file. A race condition for getting to the first scanner creation code, vs the build stream exiting with no data. If the former wins, a scanner will be created without enough data to scan. Scanners are now no longer created if the buildstream provided no data. Change 3280848 on 2017/02/01 by Leigh.Swift #jira OPP-3864: BuildPatchServices will log a FATAL error on shutdown even if it's fine to be shutting down. When BPS is shutdown, it will only set error states and cancellation logic if any installers are actually created. Change 3280839 on 2017/02/01 by Leigh.Swift Fixing whitespace damage incoming from Dev-Staging Change 3280820 on 2017/02/01 by Andrew.Brown Copying //Portal/Dev-Main-Staging to Main (//Portal/Main) Change 3280797 on 2017/02/01 by Leigh.Swift #jira OPP-6649: BPS sends undocumented analytics events. Adding documentation for the following events: Patcher.Error.Download Patcher.Warning.ChunkAborted Patcher.Error.Cache Patcher.Error.Construction Patcher.Error.Prerequisites Change 3278887 on 2017/01/31 by Richard.Fawcett Downgrade cleanup warnings to normal log output. The conditions which used to trigger these warnings are now considered to be normal behavior, in a world in which we carry out cross-app game promotions. This results in a perma-yellow state for cleanup, which is unhelpful. #nojira Change 3278738 on 2017/01/31 by Richard.Fawcett Tweak Conan launch parameters Change 3277066 on 2017/01/30 by Richard.Fawcett Remove temporary code which cleans up P:\Builds\UnrealEngineLauncher\BuildGraph, as the location no longer exists. Change 3274907 on 2017/01/27 by Leigh.Swift #jira OPP-6615: Receiving a whisper while in game may minimize game client. Refactoring SWindow ActivateOnFirstShown bool to be ActivationPolicy to give more accurate control. This also allows fixing of misuses of previous ActivateOnFirstShown variables in the implementations, which appear to mostly be interpreting it as 'AlwaysActivate'. The upgrade path is therefore ActivateOnFirstShown true/false becomes ActivationPolicy Always/Never. Moving initial minimize and maximise logic for FWindowsWindow into the Show() call on first show to gain control of activation and respect the provided policy. Refactoring existing uses to use the new variables/functions instead. The refactor of existing code is focused on preserving current always activate behaviour as opposed to changing behaviour to actually only activate on first show. Change 3273466 on 2017/01/26 by Alex.Fennell New build of OpenSSL libraries #JIRA OPP-6408 PriceEngine configuration and fixes for bugs it introduced. Change 3268045 on 2017/01/23 by Richard.Fawcett Re-adding Funcom folk to Conan chunk notification emails Change 3267709 on 2017/01/23 by Richard.Fawcett Fix launch arguments for Conan Exiles editor. Temporarily remove FunCom recipients from notification list to avoid spamming. Change 3265774 on 2017/01/20 by Chad.Garyet Merge of Engine/Build/Buildfarm over to //Portal from Dev-Build Change 3264674 on 2017/01/19 by Alex.Fennell On demand catalog requests Change 3263654 on 2017/01/19 by Leigh.Swift #jira OPP6562: Support looking up tagging and sdmeta info and using it in build diff output Adding tag use understanding to the manifest diff tool of BPT. Adding Selective Download feature support to PPT for it's diff tool, making use of portal's metadata for the feature. Change 3263623 on 2017/01/19 by Richard.Fawcett Fix issue where ManifestFilename is not always available at post build time. #jira OPP-6606 Change 3262013 on 2017/01/18 by Richard.Fawcett Remote potential for success email being sent on third party chunk failure Change 3261914 on 2017/01/18 by Richard.Fawcett Fix for user content generation job not specifying a manifest filename. Change 3261800 on 2017/01/18 by Richard.Fawcett Implement streaming S3 downloads to disk, rather than just to memory This is needed because C# has a 2 billion maximum array dimension, so files > 2GB can't be downloaded using the existing code. Change 3261675 on 2017/01/18 by Richard.Fawcett Support for overriding, or generating randomized unique manifest filenames to avoid automated harvesting from CDN BuildGraph's ChunkTask takes three new parameters ... * ManifestFilename (string) - The filename of the manifest to produce. If omitted, the value of RandomizeManifestFilename will determine how the manifest filename is determined. * RandomizeManifestFilename (bool) - If true, we'll generate a random, unique manifest filename. If false (default), we'll use legacy behavior of combining app name and build version. * LocalManifestDir (string) - Required if RandomizedManifestFilename is true. This directory will receive local copies of any manifest file produced, and a metadata file containing the name of the most recently produced manifest BuildGraph's PostBuildTask takes two new parameters ... * ManifestFilename (string) - The filename of the manifest to post. If omitted, we'll use the value from the metadat file in LocalManifestDir is this is set, otherwise use legacy behavior. * LocalManifestDir (string) - A directory containing local copies of manifest files, along with a metadata file containing the name of the manifest file produced by the most recent ChunkTask operation. Support added to the launcher build script's to use the new parameters to randomize its manifest filename, and post the randomized filename to MCP. Use of a contructor of BuildPatchToolStagingInfo which does not specify a manifest filename is now considered deprecated, and will output a warning. Remove requirement of having a BuildPatchToolStagingInfo when performing a chunking operation, instead just passing in the specific values we need from it as parameters in their own right. Remove support for non-chunk based manifests from C# wrapper, as these are no longer supported in BuildPatchTool itself. #jira OPP-6432 Change 3261647 on 2017/01/18 by Leigh.Swift Adding some cleanup to the end of some BPT functional tests so that they do not affect proceeding tests and cause red-herring warning output. Change 3261639 on 2017/01/18 by Richard.Fawcett Update app name of Conan to ConanExiles to match back-end catalog. Fix Conan launch exe and args so that launcher can detect when product is running. Was previously using a batch file which terminates after launching editor. Change 3258815 on 2017/01/16 by Wes.Fudala UTM and product info will be parsed from installer name and passed to the launcher. UTM info will be passed along as part of all analytics events. #jira OPP-6404: Add user funnel tracking Change 3258809 on 2017/01/16 by Wes.Fudala Back out changelist 3258800. Backing out changes that were intended to be made in a different stream. Change 3258800 on 2017/01/16 by Wes.Fudala App version is now also appended to user agent string. Change 3256999 on 2017/01/13 by Richard.Fawcett Fix issue where JSON file included in Publishing csproj is not reliably copied to output folder on build farm. Change 3256941 on 2017/01/13 by Richard.Fawcett Move configuration for Third Party build pipeline out of code and into its own configuration file. #epicfriday Change 3255072 on 2017/01/12 by Richard.Fawcett Add additional logging around multithreaded upload of files to S3. Fix bug ensuring that the failure of any single part of multi-part upload results in the whole file being failed. #jira OPP-6392 Change 3253672 on 2017/01/11 by Richard.Fawcett Add support for third-party Conan editor. Alter third party process so it doesn't crash if version.txt doesn't already exist in the third party S3 bucket, to allow us to setup in advance of third party publishing their first version. Change 3251901 on 2017/01/10 by Barnabas.McManners Compile fix on mac, fix for hidden method in AutomationTest define. Without this GoogleMock.spec.cpp wont compile on mac. #nojira #ReviewedBy Leigh.Swift Change 3250907 on 2017/01/09 by Justin.Sargent Changed the automation controller to uses a non-zero exit code when performing a 'quit' command if tests failed. Change 3245328 on 2017/01/03 by Justin.Sargent Enabling the logic to lowercase all C++ members exposed to javascript. Added additional to-lowering behavior to UObject binding. #jira OPP-6494 Change 3240667 on 2016/12/20 by Andrew.Brown Copying //Tasks/Portal/Dev-OPP-6109-DedicatedServer to Dev-Main (//Portal/Dev-Main) Change 3236972 on 2016/12/15 by Bob.Ferreira Updating compliation changes for AutomationDriver Change 3236567 on 2016/12/15 by Richard.Fawcett Ensure that third party product chunking uses latest CL across our P4 depot in its version number. Change 3236188 on 2016/12/15 by Richard.Fawcett Combine all launcher purchases into single workflow using the new quickPurchase API call as the initial request. #jira OPP-6257 Change 3231134 on 2016/12/12 by Alex.Fennell Improving fail case handling for the waiting room service #jira OPP-5648 Change 3228514 on 2016/12/09 by Richard.Fawcett Change filetype Change 3227080 on 2016/12/08 by Barnabas.McManners Merging CL 3226840 from Dev Editor Fixing a bug in FText formatting where it would ignore the rebuild and Rebuild as Source arguments for the format string itself #jira OPP-6485 Change 3219810 on 2016/12/02 by Ben.Marsh UAT: Fix unzip output being completely discarded. Switch it to just be verbose instead. Change 3219602 on 2016/12/02 by Ben.Marsh Add the -q (quiet) option to the Mac unzip command, since it's creating too much log output to be useful. [CL 3355309 by Justin Sargent in Main branch]
2017-03-20 18:49:23 -04:00
void FPngImageWrapper::user_read_compressed(png_structp png_ptr, png_bytep data, png_size_t length)
{
Copying //UE4/Portal-Staging to Dev-Main (//UE4/Dev-Main) (Source: //Portal/Main @ 3352026) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 3351920 on 2017/03/17 by Leigh.Swift #jira OPP-6870: [Crash] Assertion failed: ctx->ReadOffset + length <= (uint32)ctx->CompressedData.Num() [File:D:\Build\++Portal+Release-Live+Compile\Sync\Engine\Source\Runtime\ImageWrapper\Private\PngImageWrapper.cpp] [Line: 420] Instead of asserting for an incorrect data size for png image being loaded, set an error on the wrapper object. This will result in the slate brush rendering as white box, and errors going to the log which include the png resource path. Change 3350561 on 2017/03/16 by Justin.Sargent Updated the Slate standalone D3D renderer to be more fault tolerant. Added new HasLostDevice() function to SlateRenderer. If the launcher detects that it has lost the device context it will attempt to perform a full rebuild of the UI and Presentation layers, but also a full reboot of slate application and the renderer. The launcher will attempt to re-establish the device context for 5 minutes if not interrupted by the user. If the user interacts with the launcher while attempting to re-establish the device context it will instead pop up a system dialog explaining it is having issues with the video card and then will close the application. Change 3341299 on 2017/03/10 by Richard.Fawcett Validate JSON files as we're pushing to EMS Added a flexible validation framework to the system files (EMS) sync operation. Implemented a JSON validator which by default will validate .json files. Adds a "ValidationRules" property to the EMS sync config file to allow each product to define its own regex patterns for filenames which should be validated with each validator. Configured launcher's EMS to validate .product, .v?product, .layout, .sdmeta and .panel files as JSON. The great news is that this validation actually discovered a minor syntactical issue with Wex.v2product during testing, which is also fixed with this submission. \o/ #epicfriday Change 3336908 on 2017/03/08 by Leigh.Swift #jira OPP-5126: All disk size checks for BPS installations should be handled internally to BPS, the Portal code should not need to check this and can only do so less accurately. Removing disk space checks from portal code which block installers from running. NB: There is still a check in selective download code which provides tooltip information only. Moving BuildPatchInstaller disk size check to the file constructor, which is the class that most accurately knows the required amount of space. The disk check now occurs after resume and just before we start to write data. A secondary disk check is also made if a file fails to construct so that we can detect problems caused by change in available disk space. Disk space error message extended to include useful information for the user. Change 3323366 on 2017/02/27 by Richard.Fawcett Fix reference to Newtonsoft in Publishing.Automation. Change 3323205 on 2017/02/27 by Wes.Fudala Adding language support to the windows installer. Significantly expandes OneSky upload functionality. OPP-5438 Launcher installer should support the same language set supported by the launcher. Change 3316926 on 2017/02/22 by Richard.Fawcett Prevent Amazon S3 download glitches from issuing warnings until half of the maximum retries have been attempted. In practice, when we download thousands of files, we _do_ get failures which need to be retried. This means that pretty much all jobs result in warnings, which isn't appropriate. This should turn jobs green again, and only warn us when things look unusual. #jira OPP-6607 Change 3315996 on 2017/02/21 by Justin.Sargent Incrementing Portal version number I'm incrementing this earlier than normal due to a need to depend on a new version number for EMS layout change versioning. Change 3312760 on 2017/02/20 by Wes.Fudala Users can now select desired environment/region from the UI. New login screen. Adds slid out settings menu to login screen. Adds region and language selection to the settings menu. Adds support for PortalRegions ini. Adds DefaultPortalRegions ini. Adds RegionRepository, RegionPublisher, RegionSelectService, and RegionIdentificationService. Adds region select option in debugtools general section. Adds RegionSelectService unit test with associated mocks. Changes the way all backend connections are configured so that values are now pulled from config files. Renames product region selector files to avoid some confusion with portal region files. Updated EmsConfigUpdater and HotfixManager so they support optional overwrite and save of ini files. Region publisher now restricts regions that require permissions in shipping builds. Fixes a bug causing items to get stuck in the download queue UI after we failed to obtain a manifest when reaching out the the backend. #jira OPP-6121, OPP-5809 Change 3311664 on 2017/02/20 by Andrew.Brown Added GetTypeHash support for FDelegateHandle Change 3311505 on 2017/02/20 by Richard.Fawcett Rename/move file(s) Change 3309004 on 2017/02/17 by Chad.Garyet adding in additional platforms for the BuildPlugin commandline Change 3299188 on 2017/02/13 by Leigh.Swift #jira OPP-6711: [CRASH] Assertion failed: IsComplete() Race condition in portal hack allowed an installer to attempt to execute complete delegate before being complete. Change 3294197 on 2017/02/09 by Richard.Fawcett Adding ValidPrereqIds.json This is needed now because the script to enforce correct prereq ids reaches out to Perforce to access this file! #jira OPP-6583 Change 3294059 on 2017/02/09 by Richard.Fawcett Fix comment on PostBuild parameter to reference correct name of "Manifest" property. Change 3293377 on 2017/02/08 by Richard.Fawcett Remove need for a metadata file containing name of generated manifest when using randomized manifest filenames. Change 3282865 on 2017/02/02 by Richard.Fawcett Simplify params to BuildGraph's ChunkTask / PostBuildTask Also, downgrade warnings to simple log messages when falling back to legacy manifest filename construction to ease transition into randomized manifest filenames for game teams. #jira OPP-6435 Change 3282809 on 2017/02/02 by Leigh.Swift #jira OPP-6564: BPT will crash if the FileIgnoreList input instructs the build streamer to ignore every build file. A race condition for getting to the first scanner creation code, vs the build stream exiting with no data. If the former wins, a scanner will be created without enough data to scan. Scanners are now no longer created if the buildstream provided no data. Change 3280848 on 2017/02/01 by Leigh.Swift #jira OPP-3864: BuildPatchServices will log a FATAL error on shutdown even if it's fine to be shutting down. When BPS is shutdown, it will only set error states and cancellation logic if any installers are actually created. Change 3280839 on 2017/02/01 by Leigh.Swift Fixing whitespace damage incoming from Dev-Staging Change 3280820 on 2017/02/01 by Andrew.Brown Copying //Portal/Dev-Main-Staging to Main (//Portal/Main) Change 3280797 on 2017/02/01 by Leigh.Swift #jira OPP-6649: BPS sends undocumented analytics events. Adding documentation for the following events: Patcher.Error.Download Patcher.Warning.ChunkAborted Patcher.Error.Cache Patcher.Error.Construction Patcher.Error.Prerequisites Change 3278887 on 2017/01/31 by Richard.Fawcett Downgrade cleanup warnings to normal log output. The conditions which used to trigger these warnings are now considered to be normal behavior, in a world in which we carry out cross-app game promotions. This results in a perma-yellow state for cleanup, which is unhelpful. #nojira Change 3278738 on 2017/01/31 by Richard.Fawcett Tweak Conan launch parameters Change 3277066 on 2017/01/30 by Richard.Fawcett Remove temporary code which cleans up P:\Builds\UnrealEngineLauncher\BuildGraph, as the location no longer exists. Change 3274907 on 2017/01/27 by Leigh.Swift #jira OPP-6615: Receiving a whisper while in game may minimize game client. Refactoring SWindow ActivateOnFirstShown bool to be ActivationPolicy to give more accurate control. This also allows fixing of misuses of previous ActivateOnFirstShown variables in the implementations, which appear to mostly be interpreting it as 'AlwaysActivate'. The upgrade path is therefore ActivateOnFirstShown true/false becomes ActivationPolicy Always/Never. Moving initial minimize and maximise logic for FWindowsWindow into the Show() call on first show to gain control of activation and respect the provided policy. Refactoring existing uses to use the new variables/functions instead. The refactor of existing code is focused on preserving current always activate behaviour as opposed to changing behaviour to actually only activate on first show. Change 3273466 on 2017/01/26 by Alex.Fennell New build of OpenSSL libraries #JIRA OPP-6408 PriceEngine configuration and fixes for bugs it introduced. Change 3268045 on 2017/01/23 by Richard.Fawcett Re-adding Funcom folk to Conan chunk notification emails Change 3267709 on 2017/01/23 by Richard.Fawcett Fix launch arguments for Conan Exiles editor. Temporarily remove FunCom recipients from notification list to avoid spamming. Change 3265774 on 2017/01/20 by Chad.Garyet Merge of Engine/Build/Buildfarm over to //Portal from Dev-Build Change 3264674 on 2017/01/19 by Alex.Fennell On demand catalog requests Change 3263654 on 2017/01/19 by Leigh.Swift #jira OPP6562: Support looking up tagging and sdmeta info and using it in build diff output Adding tag use understanding to the manifest diff tool of BPT. Adding Selective Download feature support to PPT for it's diff tool, making use of portal's metadata for the feature. Change 3263623 on 2017/01/19 by Richard.Fawcett Fix issue where ManifestFilename is not always available at post build time. #jira OPP-6606 Change 3262013 on 2017/01/18 by Richard.Fawcett Remote potential for success email being sent on third party chunk failure Change 3261914 on 2017/01/18 by Richard.Fawcett Fix for user content generation job not specifying a manifest filename. Change 3261800 on 2017/01/18 by Richard.Fawcett Implement streaming S3 downloads to disk, rather than just to memory This is needed because C# has a 2 billion maximum array dimension, so files > 2GB can't be downloaded using the existing code. Change 3261675 on 2017/01/18 by Richard.Fawcett Support for overriding, or generating randomized unique manifest filenames to avoid automated harvesting from CDN BuildGraph's ChunkTask takes three new parameters ... * ManifestFilename (string) - The filename of the manifest to produce. If omitted, the value of RandomizeManifestFilename will determine how the manifest filename is determined. * RandomizeManifestFilename (bool) - If true, we'll generate a random, unique manifest filename. If false (default), we'll use legacy behavior of combining app name and build version. * LocalManifestDir (string) - Required if RandomizedManifestFilename is true. This directory will receive local copies of any manifest file produced, and a metadata file containing the name of the most recently produced manifest BuildGraph's PostBuildTask takes two new parameters ... * ManifestFilename (string) - The filename of the manifest to post. If omitted, we'll use the value from the metadat file in LocalManifestDir is this is set, otherwise use legacy behavior. * LocalManifestDir (string) - A directory containing local copies of manifest files, along with a metadata file containing the name of the manifest file produced by the most recent ChunkTask operation. Support added to the launcher build script's to use the new parameters to randomize its manifest filename, and post the randomized filename to MCP. Use of a contructor of BuildPatchToolStagingInfo which does not specify a manifest filename is now considered deprecated, and will output a warning. Remove requirement of having a BuildPatchToolStagingInfo when performing a chunking operation, instead just passing in the specific values we need from it as parameters in their own right. Remove support for non-chunk based manifests from C# wrapper, as these are no longer supported in BuildPatchTool itself. #jira OPP-6432 Change 3261647 on 2017/01/18 by Leigh.Swift Adding some cleanup to the end of some BPT functional tests so that they do not affect proceeding tests and cause red-herring warning output. Change 3261639 on 2017/01/18 by Richard.Fawcett Update app name of Conan to ConanExiles to match back-end catalog. Fix Conan launch exe and args so that launcher can detect when product is running. Was previously using a batch file which terminates after launching editor. Change 3258815 on 2017/01/16 by Wes.Fudala UTM and product info will be parsed from installer name and passed to the launcher. UTM info will be passed along as part of all analytics events. #jira OPP-6404: Add user funnel tracking Change 3258809 on 2017/01/16 by Wes.Fudala Back out changelist 3258800. Backing out changes that were intended to be made in a different stream. Change 3258800 on 2017/01/16 by Wes.Fudala App version is now also appended to user agent string. Change 3256999 on 2017/01/13 by Richard.Fawcett Fix issue where JSON file included in Publishing csproj is not reliably copied to output folder on build farm. Change 3256941 on 2017/01/13 by Richard.Fawcett Move configuration for Third Party build pipeline out of code and into its own configuration file. #epicfriday Change 3255072 on 2017/01/12 by Richard.Fawcett Add additional logging around multithreaded upload of files to S3. Fix bug ensuring that the failure of any single part of multi-part upload results in the whole file being failed. #jira OPP-6392 Change 3253672 on 2017/01/11 by Richard.Fawcett Add support for third-party Conan editor. Alter third party process so it doesn't crash if version.txt doesn't already exist in the third party S3 bucket, to allow us to setup in advance of third party publishing their first version. Change 3251901 on 2017/01/10 by Barnabas.McManners Compile fix on mac, fix for hidden method in AutomationTest define. Without this GoogleMock.spec.cpp wont compile on mac. #nojira #ReviewedBy Leigh.Swift Change 3250907 on 2017/01/09 by Justin.Sargent Changed the automation controller to uses a non-zero exit code when performing a 'quit' command if tests failed. Change 3245328 on 2017/01/03 by Justin.Sargent Enabling the logic to lowercase all C++ members exposed to javascript. Added additional to-lowering behavior to UObject binding. #jira OPP-6494 Change 3240667 on 2016/12/20 by Andrew.Brown Copying //Tasks/Portal/Dev-OPP-6109-DedicatedServer to Dev-Main (//Portal/Dev-Main) Change 3236972 on 2016/12/15 by Bob.Ferreira Updating compliation changes for AutomationDriver Change 3236567 on 2016/12/15 by Richard.Fawcett Ensure that third party product chunking uses latest CL across our P4 depot in its version number. Change 3236188 on 2016/12/15 by Richard.Fawcett Combine all launcher purchases into single workflow using the new quickPurchase API call as the initial request. #jira OPP-6257 Change 3231134 on 2016/12/12 by Alex.Fennell Improving fail case handling for the waiting room service #jira OPP-5648 Change 3228514 on 2016/12/09 by Richard.Fawcett Change filetype Change 3227080 on 2016/12/08 by Barnabas.McManners Merging CL 3226840 from Dev Editor Fixing a bug in FText formatting where it would ignore the rebuild and Rebuild as Source arguments for the format string itself #jira OPP-6485 Change 3219810 on 2016/12/02 by Ben.Marsh UAT: Fix unzip output being completely discarded. Switch it to just be verbose instead. Change 3219602 on 2016/12/02 by Ben.Marsh Add the -q (quiet) option to the Mac unzip command, since it's creating too much log output to be useful. [CL 3355309 by Justin Sargent in Main branch]
2017-03-20 18:49:23 -04:00
FPngImageWrapper* ctx = (FPngImageWrapper*)png_get_io_ptr(png_ptr);
if (ctx->ReadOffset + length <= (uint32)ctx->CompressedData.Num())
{
FMemory::Memcpy(data, &ctx->CompressedData[ctx->ReadOffset], length);
ctx->ReadOffset += length;
}
else
{
ctx->SetError(TEXT("Invalid read position for CompressedData."));
}
}
void FPngImageWrapper::user_write_compressed( png_structp png_ptr, png_bytep data, png_size_t length )
{
FPngImageWrapper* ctx = (FPngImageWrapper*) png_get_io_ptr(png_ptr);
int32 Offset = ctx->CompressedData.AddUninitialized( length);
FMemory::Memcpy(&ctx->CompressedData[Offset], data, length);
}
void FPngImageWrapper::user_flush_data( png_structp png_ptr )
{
}
void FPngImageWrapper::user_error_fn( png_structp png_ptr, png_const_charp error_msg )
{
FPngImageWrapper* ctx = (FPngImageWrapper*)png_get_io_ptr( png_ptr );
{
FString ErrorMsg = ANSI_TO_TCHAR(error_msg);
ctx->SetError(*ErrorMsg);
UE_LOG(LogImageWrapper, Error, TEXT("PNG Error: %s"), *ErrorMsg);
#if !PLATFORM_EXCEPTIONS_DISABLED
/**
* libPNG has a known issue in version 1.5.2 causing
* an unhandled exception upon a CRC error. This code
* detects the error manually and throws our own
* exception to be handled.
*/
if (ErrorMsg.Contains(TEXT("CRC error")))
{
throw FPNGImageCRCError(ErrorMsg);
}
#endif
}
// Ensure that FString is destructed prior to executing the longjmp
longjmp(ctx->SetjmpBuffer, 1);
}
void FPngImageWrapper::user_warning_fn( png_structp png_ptr, png_const_charp warning_msg )
{
UE_LOG(LogImageWrapper, Warning, TEXT("PNG Warning: %s"), ANSI_TO_TCHAR(warning_msg));
}
void* FPngImageWrapper::user_malloc( png_structp /*png_ptr*/, png_size_t size)
{
check(size > 0);
return FMemory::Malloc(size);
}
void FPngImageWrapper::user_free(png_structp /*png_ptr*/, png_voidp struct_ptr )
{
check(struct_ptr);
FMemory::Free(struct_ptr);
}
// Renable warning "interaction between '_setjmp' and C++ object destruction is non-portable"
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 3232619) #lockdown Nick.Penwarden #rb none ========================== MAJOR FEATURES + CHANGES ========================== Change 3121996 on 2016/09/12 by Ben.Marsh Add support for Visual Studio 2017 (aka "15"; assuming consistent naming with other versions until final name is announced). * Compiler, STL implementation and CRT are binary compatible with VS2015 (see https://blogs.msdn.microsoft.com/vcblog/2016/08/24/c1417-features-and-stl-fixes-in-vs-15-preview-4/), so no new third-party libraries needed so far. WindowsPlatform.GetVisualStudioCompilerVersionName() returns "2015" as a result. * Default compiler for compiling and generating project files is still VS 2015 for now. Pass -2017 on the command line to GenerateProjectFiles.bat to generate VS2017 projects. Projects generated for VS2017 will use the 2017 compiler by default. * Visual Studio source code accessor can talk to VS 2017 instances. * Added a VS2017 configuration for UnrealVS, and added precompiled vsix package. * Switched GetVSComnTools to check the SOFTWARE\Microsoft\VisualStudio\SxS\VS7 registry key rather than the individual product install registry key. "15" doesn't seem to have it's own "InstallDir" key, but this system seems to work for all versions of Visual Studio (including previous releases of VS Express). * Removed ATL dependency from VisualStudioSourceCodeAccessor. It's not installed with VS by default any more, and is only used for a couple of smart pointer classes. Tested running the editor and packaging TP_Flying for Win64. Packaging from the editor still defaults to using the 2015 compiler, so ConfigureToolchain() needs to be overriden from the .target.cs file if multiple Visual Studio versions are installed. Change 3189363 on 2016/11/07 by Ben.Marsh Consolidate functionality for determining the path to MSBuild.exe to use for compiling UE4 tools into a single batch file (GetMSBuildToolPath) and fix "Clean" not working on PS4 due to include/library paths being set to something by the Visual Studio environment. Change 3210598 on 2016/11/27 by Ben.Marsh UBT: Prevent the name of each file compiled being output twice on XboxOne. Compiler already outputs this string; the action doesn't need to. Change 3210601 on 2016/11/27 by Ben.Marsh PR #2967: Add silent version of switch game version (Contributed by EricLeeFriedman) Change 3210602 on 2016/11/27 by Ben.Marsh PR #2964: GitDependencies shouldn't try to clean up working directory files that are excluded or ignored (Contributed by joelmcginnis) Change 3210605 on 2016/11/27 by Ben.Marsh UGS: Add a warning when syncing latest would remove changes that have been authored locally. Typically happens when working with precompiled binaries. Change 3211656 on 2016/11/28 by Ben.Marsh UBT: Move ModuleRules and TargetRules into their own file. Change 3211797 on 2016/11/28 by Ben.Marsh UBT: Remove utility functions from TargetRules for checking different classes of target types. Moving TargetRules to be data-only. Change 3211833 on 2016/11/28 by Ben.Marsh UBT: Remove overridable configuration name from target rules. This feature is not used anywhere. Change 3211859 on 2016/11/28 by Ben.Marsh UBT: Deprecate the GetGeneratedCodeVersion() callback in favor of a member variable instead. Change 3211942 on 2016/11/28 by Ben.Marsh UBT: Remove legacy code which tries to change the output paths for console binaries. Output paths for monolithic binaries are always in the project folder now. Change 3215333 on 2016/11/30 by Ben.Marsh UBT: Replace the GetSupportedPlatforms() callback on TargetRules with a SupportedPlatforms attribute. Since a TargetRules object can only be instantiated with an actual platform, it doesn't make sense for it to be an instance method. Change 3215482 on 2016/11/30 by Ben.Marsh UBT: Remove the GetSupportedConfigurations() callback on the TargetRules class. A configuration is required to construct a TargetRules instance, so it doesn't make sense to need to call an instance method to find out which configurations are supported. Change 3215743 on 2016/11/30 by Ben.Marsh UBT: Deprecate the TargetRules.ShouldCompileMonolithic() function: this function requires access to the global command line to operate correctly, which prevents creating target-specific instances, and does not use the platform/configuration passed into the TargetRules constructor. Rather than being a callback, the LinkType field can now be set to TargetLinkType.Modular or TargetLinkType.Monolithic from the constructor as appropriate. The default value (TargetLinkType.Default) results in the default link type for the target type being used. Parsing of the command-line overrides is now done when building the TargetDescriptor. Change 3215778 on 2016/11/30 by Ben.Marsh UBT: Mark overrides of the TargetRules.GetModulesToPrecompile method as obsolete. Change 3217681 on 2016/12/01 by Ben.Marsh UAT: Prevent UE4Build deleting .modules files when running with the -Clean argument; these files are artifacts generated by UBT itself, not by the exported XGE script. Change 3217723 on 2016/12/01 by Ben.Marsh UBT: Run pre- and post-build steps for all plugins that are being built, not just those that are enabled. Change 3217930 on 2016/12/01 by Ben.Marsh UGS: Add a perforce settings window, allowing users to set optional values for tuning Perforce performance on unreliable connections. Change 3218762 on 2016/12/02 by Ben.Marsh Enable warnings whenever an undefined macro is used in a constant expression inside an #if or #elif directive, and fix existing violations. Change 3219161 on 2016/12/02 by Ben.Marsh Core: Use the directory containing the current module to derive the UE4 base directory, rather than the executable directory. Allows UE4 to be hosted by a process in a different directory. Change 3219197 on 2016/12/02 by Ben.Marsh Core: When loading a DLL from disk, convert any relative paths to absolute before calling LoadLibrary. The OS resolves these paths relative to the directory containing the process executable -- not the working directory -- so paths need to be absolute to allow UE4 to be hosted by a process elsewhere. Change 3219209 on 2016/12/02 by Ben.Marsh Replace some calls to LoadLibrary() with FPlatformProcess::GetDllHandle(). The UE4 function makes sure that relative paths are resolved relative to the correct base directory, which is important when the host executable is not in Engine/Binaries/Win64. Change 3219610 on 2016/12/02 by Ben.Marsh Add the -q (quiet) option to the Mac unzip command, since it's creating too much log output to be useful. Change 3219731 on 2016/12/02 by Ben.Marsh UBT: Add option to disable IWYU checks regarding the use of monolithic headers (Engine.h, UnrealEd.h, etc...) and including the matching header for a cpp file first. bEnforceIWYU can be set to false in UEBuildConfiguration or on a per-module basis in the module rules. Change 3220796 on 2016/12/04 by Ben.Marsh Remove PrepForUATPackageOrDeploy from the UEBuildDeploy base class. It never has to be accessed through the base class anyway. Change 3220825 on 2016/12/04 by Ben.Marsh UBT: Change all executors to derive from a common base class (ActionExecutor). Change 3220834 on 2016/12/04 by Ben.Marsh UBT: Remove the global CommandLineContains() function. Change 3222706 on 2016/12/05 by Ben.Marsh Merging CL 3221949 from //UE4/Release-4.14: Fixes to code analysis template causing problems with stock install of VS2017. Change 3222712 on 2016/12/05 by Ben.Marsh Merging CL 3222021 from //UE4/Release-4.14: Change detection of MSBuild.exe path to match GetMSBuildPath.bat Change 3223628 on 2016/12/06 by Ben.Marsh Merging CL 3223369 from 4.14 branch: Use the same logic as GetMsBuildPath.bat inside FDesktopPlatformBase to determine path to MSBuild.exe Change 3223817 on 2016/12/06 by Ben.Marsh Remove non-ANSI characters from source files. Compiler/P4 support is patchy for this, and we want to avoid failing prey to different codepages resulting in different interpretations of the source text. Change 3224046 on 2016/12/06 by Ben.Marsh Remove the need for the iOS/TVOS deployment instances to have an IOSPlatformContext instance. The only dependency between the two -- a call to GetRequiredCapabilities() -- is now implemented by querying the INI file for the supported architectures when neeeded. Change 3224792 on 2016/12/07 by Ben.Marsh UBT: Touch PCH wrapper files whenever the file they include is newer rather than writing the timestamp for the included file into it as a comment. Allows use of ccache and similar tools. Change 3225212 on 2016/12/07 by Ben.Marsh UBT: Move settings required for deployment into the UEBuildDeployTarget class, allowing them to be serialized to and from a file the intermediate directory without having to construct a phony UEBuildTarget to deploy. Deployment is now performed by a method on UEBuildPlatform, rather than having to create a UEBuildPlatformContext and using that to create a UEBuildDeploy object. The -prepfordeploy UBT invocation from UAT, previously done by the per-platform PostBuildTarget() callback when building with XGE, is replaced by running UBT with a path to the serialized UEBuildDeployTarget object, and can be done in a platform agnostic manner. Change 3226310 on 2016/12/07 by Ben.Marsh PR #3015: Fixes wrong VSC++ flags being passed for .c files (Contributed by badlogic) Change 3228273 on 2016/12/08 by Ben.Marsh Update copyright notices for QAGame. Change 3229166 on 2016/12/09 by Ben.Marsh UBT: Rewritten config file parser. No longer requires hard-coded list of sections to be parsed, but parses them on demand. Measured 2x faster read speeds (largely due to eliminating construction of temporary string objects when parsing each line, to trim whitespace and so on). Also includes an attribute-driven parser, which allows reading named config values for marked up fields in an object. Change 3230601 on 2016/12/12 by Ben.Marsh Swarm: Change Swarm AgentInterface to target .NET framework 4.5, to remove dependency on having 4.0 framework installed. Change 3230737 on 2016/12/12 by Ben.Marsh UAT: Stop UE4Build deriving from CommandUtils. Confusing pattern, and causes problems trying to access instance variables that are only set for build commands. Change 3230751 on 2016/12/12 by Ben.Marsh UAT: Move ParseParam*() functions which use the instanced parameter list from CommandUtils to BuildCommand, since that's the only thing that it's instanced for. Change 3230804 on 2016/12/12 by Ben.Marsh UBT: Add the IsPromotedBuild flag to Build.version, and only set the bFormalBuild flag in UBT if it's set. This allows UGS users to avoid having to compile separate RC files for each output binary. Change 3230831 on 2016/12/12 by Ben.Marsh UGS: Warn when trying to switch streams if files are checked out. Change 3231281 on 2016/12/12 by Chad.Garyet Fixing a bug where .modules files were getting put into receipts with their absolute path instead of their relative one Change 3231496 on 2016/12/12 by Ben.Marsh Disable code analysis in CrashReportProcess; causes warnings when compiled with VS2015. Change 3231979 on 2016/12/12 by Ben.Marsh UBT: Suppress LNK4221 when generating import libraries. This can happen often when generating import libraries separately to linking. Change 3232619 on 2016/12/13 by Ben.Marsh Fix "#pragma once in main file" errors on Mac, which are occurring in //UE4/Main. [CL 3232653 by Ben Marsh in Main branch]
2016-12-13 11:58:16 -05:00
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif //WITH_UNREALPNG