S57ClassRegistrar::FindAttrByAcronym return type should be GUInt16 to support the Inland_waterways S57_PROFILE

[julius6]

When using the Inland_waterways S57_PROFILE and consequently s57attributes_iw.csv, attributes might exist with "Code" > 32767. To cope with this, the signature of the S57ClassRegistrar::FindAttrByAcronym member function should be changed from:

GInt16      FindAttrByAcronym( const char * );

to:

GUInt16      FindAttrByAcronym( const char * );

When GInt16 is used, an access violation error, more in detail an out-of-bound access in the panAttrIndex array, happens in s57featuredefns.cpp, function S57GenerateObjectClassDefn, line 399:

switch( poCR->GetAttrType( iAttrIndex ) )

Environment: Windows XP SP3, MSVC2008 SP1

[Even Rouault]

Fixned in trunk (r25501) and branches/1.9 (r25502)

I've fixed it differently by returning a int, since -1 can be returned in case there's no match. I just compile-tested it though, so please report if it doesn't work for you

[julius6]

The fix works for me. Thanks