diff
stringlengths 41
2.03M
| msg
stringlengths 1
1.5k
⌀ | repo
stringlengths 5
40
| sha
stringlengths 40
40
| time
stringlengths 20
20
|
|---|---|---|---|---|
mmm a / lib / IRGen / OptimizeARC . cpp <nl> ppp b / lib / IRGen / OptimizeARC . cpp <nl> STATISTIC ( NumNoopDeleted , <nl> " Number of no - op swift calls eliminated " ) ; <nl> STATISTIC ( NumRetainReleasePairs , <nl> " Number of swift retain / release pairs eliminated " ) ; <nl> + STATISTIC ( NumAllocateReleasePairs , <nl> + " Number of swift allocate / release pairs eliminated " ) ; <nl> <nl> / / = = = mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - = = = / / <nl> / / Utility Functions <nl> static bool performLocalReleaseMotion ( CallInst & Release , BasicBlock & BB ) { <nl> goto OutOfLoop ; <nl> } <nl> <nl> + case RT_AllocObject : { / / % obj = swift_alloc ( . . . ) <nl> + CallInst & Allocation = cast < CallInst > ( * BBI ) ; <nl> + <nl> + / / If this is an allocation of an unrelated object , just ignore it . <nl> + / / TODO : This is not safe without proving the object being released is not <nl> + / / related to the allocated object . Consider something silly like this : <nl> + / / A = allocate ( ) <nl> + / / B = bitcast A to object <nl> + / / release ( B ) <nl> + if ( ReleasedObject ! = & Allocation ) { <nl> + + + BBI ; <nl> + goto OutOfLoop ; <nl> + } <nl> + <nl> + / / If this is a release right after an allocation of the object , then we <nl> + / / can zap both . <nl> + Allocation . replaceAllUsesWith ( UndefValue : : get ( Allocation . getType ( ) ) ) ; <nl> + Allocation . eraseFromParent ( ) ; <nl> + Release . eraseFromParent ( ) ; <nl> + + + NumAllocateReleasePairs ; <nl> + return true ; <nl> + } <nl> + <nl> case RT_Unknown : <nl> - case RT_AllocObject : <nl> / / Otherwise , we get to something unknown / unhandled . Bail out for now . <nl> + + BBI ; <nl> goto OutOfLoop ; <nl>
|
enhance the optimizer to delete release ( allocate ( ) ) pairs . This is enough to zap 2 of
|
apple/swift
|
71916015693bba135b4cf38ec91e6b3b23b11340
|
2012-05-28T17:05:42Z
|
mmm a / README . md <nl> ppp b / README . md <nl> <nl> - ! [ GODOT ] / logo . png <nl> + ! [ GODOT ] ( / logo . png ) <nl> <nl> # # # The Engine <nl> <nl>
|
hoho
|
godotengine/godot
|
7cb54f712a9ea4e982a8384c029cfae22fecaa42
|
2014-02-10T02:14:35Z
|
mmm a / examples / CMakeLists . txt <nl> ppp b / examples / CMakeLists . txt <nl> add_example ( kcentroid_ex ) <nl> add_example ( kkmeans_ex ) <nl> add_example ( krls_ex ) <nl> add_example ( krls_filter_ex ) <nl> + add_example ( krr_classification_ex ) <nl> + add_example ( krr_regression_ex ) <nl> add_example ( linear_manifold_regularizer_ex ) <nl> add_example ( logger_ex ) <nl> add_example ( logger_ex_2 ) <nl> new file mode 100644 <nl> index 000000000 . . 41664247a <nl> mmm / dev / null <nl> ppp b / examples / krr_classification_ex . cpp <nl> <nl> + / / The contents of this file are in the public domain . See LICENSE_FOR_EXAMPLE_PROGRAMS . txt <nl> + / * <nl> + <nl> + This is an example illustrating the use of the kernel ridge regression <nl> + object from the dlib C + + Library . <nl> + <nl> + This example creates a simple set of data to train on and then shows <nl> + you how to use the kernel ridge regression tool to find a good decision <nl> + function that can classify examples in our data set . <nl> + <nl> + <nl> + The data used in this example will be 2 dimensional data and will <nl> + come from a distribution where points with a distance less than 13 <nl> + from the origin are labeled + 1 and all other points are labeled <nl> + as - 1 . All together , the dataset will contain 10201 sample points . <nl> + <nl> + * / <nl> + <nl> + <nl> + # include < iostream > <nl> + # include " dlib / svm . h " <nl> + <nl> + using namespace std ; <nl> + using namespace dlib ; <nl> + <nl> + <nl> + int main ( ) <nl> + { <nl> + / / This typedef declares a matrix with 2 rows and 1 column . It will be the <nl> + / / object that contains each of our 2 dimensional samples . ( Note that if you wanted <nl> + / / more than 2 features in this vector you can simply change the 2 to something else . <nl> + / / Or if you don ' t know how many features you want until runtime then you can put a 0 <nl> + / / here and use the matrix . set_size ( ) member function ) <nl> + typedef matrix < double , 2 , 1 > sample_type ; <nl> + <nl> + / / This is a typedef for the type of kernel we are going to use in this example . <nl> + / / In this case I have selected the radial basis kernel that can operate on our <nl> + / / 2D sample_type objects <nl> + typedef radial_basis_kernel < sample_type > kernel_type ; <nl> + <nl> + <nl> + / / Now we make objects to contain our samples and their respective labels . <nl> + std : : vector < sample_type > samples ; <nl> + std : : vector < double > labels ; <nl> + <nl> + / / Now lets put some data into our samples and labels objects . We do this <nl> + / / by looping over a bunch of points and labeling them according to their <nl> + / / distance from the origin . <nl> + for ( double r = - 20 ; r < = 20 ; r + = 0 . 4 ) <nl> + { <nl> + for ( double c = - 20 ; c < = 20 ; c + = 0 . 4 ) <nl> + { <nl> + sample_type samp ; <nl> + samp ( 0 ) = r ; <nl> + samp ( 1 ) = c ; <nl> + samples . push_back ( samp ) ; <nl> + <nl> + / / if this point is less than 13 from the origin <nl> + if ( sqrt ( ( double ) r * r + c * c ) < = 13 ) <nl> + labels . push_back ( + 1 ) ; <nl> + else <nl> + labels . push_back ( - 1 ) ; <nl> + <nl> + } <nl> + } <nl> + <nl> + cout < < " samples generated : " < < samples . size ( ) < < endl ; <nl> + cout < < " number of + 1 samples : " < < sum ( vector_to_matrix ( labels ) > 0 ) < < endl ; <nl> + cout < < " number of - 1 samples : " < < sum ( vector_to_matrix ( labels ) < 0 ) < < endl ; <nl> + <nl> + / / Here we normalize all the samples by subtracting their mean and dividing by their standard deviation . <nl> + / / This is generally a good idea since it often heads off numerical stability problems and also <nl> + / / prevents one large feature from smothering others . Doing this doesn ' t matter much in this example <nl> + / / so I ' m just doing this here so you can see an easy way to accomplish this with <nl> + / / the library . <nl> + vector_normalizer < sample_type > normalizer ; <nl> + / / let the normalizer learn the mean and standard deviation of the samples <nl> + normalizer . train ( samples ) ; <nl> + / / now normalize each sample <nl> + for ( unsigned long i = 0 ; i < samples . size ( ) ; + + i ) <nl> + samples [ i ] = normalizer ( samples [ i ] ) ; <nl> + <nl> + <nl> + / / here we make an instance of the krr_trainer object that uses our kernel type . <nl> + krr_trainer < kernel_type > trainer ; <nl> + <nl> + / / The krr_trainer has the ability to perform leave - one - out cross - validation . <nl> + / / This function tells it to measure errors in terms of the number of classification <nl> + / / mistakes instead of mean squared error between decision function output values <nl> + / / and labels . Which is what we want to do since we are performing classification . <nl> + trainer . use_classification_loss_for_loo_cv ( ) ; <nl> + <nl> + <nl> + / / Now we loop over some different gamma values to see how good they are . <nl> + cout < < " \ ndoing leave - one - out cross - validation " < < endl ; <nl> + for ( double gamma = 0 . 000001 ; gamma < = 1 ; gamma * = 5 ) <nl> + { <nl> + / / tell the trainer the parameters we want to use <nl> + trainer . set_kernel ( kernel_type ( gamma ) ) ; <nl> + <nl> + double loo_error ; <nl> + trainer . train ( samples , labels , loo_error ) ; <nl> + <nl> + / / Print gamma and the fraction of samples misclassified during LOO cross - validation . <nl> + cout < < " gamma : " < < gamma < < " LOO error : " < < loo_error < < endl ; <nl> + } <nl> + <nl> + <nl> + / / From looking at the output of the above loop it turns out that a good value for <nl> + / / gamma for this problem is 0 . 015 . So that is what we will use . <nl> + trainer . set_kernel ( kernel_type ( 0 . 015 ) ) ; <nl> + typedef decision_function < kernel_type > dec_funct_type ; <nl> + typedef normalized_function < dec_funct_type > funct_type ; <nl> + <nl> + <nl> + / / Here we are making an instance of the normalized_function object . This object provides a convenient <nl> + / / way to store the vector normalization information along with the decision function we are <nl> + / / going to learn . <nl> + funct_type learned_function ; <nl> + learned_function . normalizer = normalizer ; / / save normalization information <nl> + learned_function . function = trainer . train ( samples , labels ) ; / / perform the actual training and save the results <nl> + <nl> + / / print out the number of basis vectors in the resulting decision function <nl> + cout < < " \ nnumber of basis vectors in our learned_function is " <nl> + < < learned_function . function . basis_vectors . size ( ) < < endl ; <nl> + <nl> + / / Now lets try this decision_function on some samples we haven ' t seen before . <nl> + / / The decision function will return values > = 0 for samples it predicts <nl> + / / are in the + 1 class and numbers < 0 for samples it predicts to be in the - 1 class . <nl> + sample_type sample ; <nl> + <nl> + sample ( 0 ) = 3 . 123 ; <nl> + sample ( 1 ) = 2 ; <nl> + cout < < " This sample should be > = 0 and it is classified as a " < < learned_function ( sample ) < < endl ; <nl> + <nl> + sample ( 0 ) = 3 . 123 ; <nl> + sample ( 1 ) = 9 . 3545 ; <nl> + cout < < " This sample should be > = 0 and it is classified as a " < < learned_function ( sample ) < < endl ; <nl> + <nl> + sample ( 0 ) = 13 . 123 ; <nl> + sample ( 1 ) = 9 . 3545 ; <nl> + cout < < " This sample should be < 0 and it is classified as a " < < learned_function ( sample ) < < endl ; <nl> + <nl> + sample ( 0 ) = 13 . 123 ; <nl> + sample ( 1 ) = 0 ; <nl> + cout < < " This sample should be < 0 and it is classified as a " < < learned_function ( sample ) < < endl ; <nl> + <nl> + <nl> + / / We can also train a decision function that reports a well conditioned probability <nl> + / / instead of just a number > 0 for the + 1 class and < 0 for the - 1 class . An example <nl> + / / of doing that follows : <nl> + typedef probabilistic_decision_function < kernel_type > probabilistic_funct_type ; <nl> + typedef normalized_function < probabilistic_funct_type > pfunct_type ; <nl> + <nl> + pfunct_type learned_pfunct ; <nl> + learned_pfunct . normalizer = normalizer ; <nl> + learned_pfunct . function = train_probabilistic_decision_function ( trainer , samples , labels , 3 ) ; <nl> + / / Now we have a function that returns the probability that a given sample is of the + 1 class . <nl> + <nl> + / / print out the number of basis vectors in the resulting decision function . <nl> + / / ( it should be the same as in the one above ) <nl> + cout < < " \ nnumber of basis vectors in our learned_pfunct is " <nl> + < < learned_pfunct . function . decision_funct . basis_vectors . size ( ) < < endl ; <nl> + <nl> + sample ( 0 ) = 3 . 123 ; <nl> + sample ( 1 ) = 2 ; <nl> + cout < < " This + 1 example should have high probability . Its probability is : " < < learned_pfunct ( sample ) < < endl ; <nl> + <nl> + sample ( 0 ) = 3 . 123 ; <nl> + sample ( 1 ) = 9 . 3545 ; <nl> + cout < < " This + 1 example should have high probability . Its probability is : " < < learned_pfunct ( sample ) < < endl ; <nl> + <nl> + sample ( 0 ) = 13 . 123 ; <nl> + sample ( 1 ) = 9 . 3545 ; <nl> + cout < < " This - 1 example should have low probability . Its probability is : " < < learned_pfunct ( sample ) < < endl ; <nl> + <nl> + sample ( 0 ) = 13 . 123 ; <nl> + sample ( 1 ) = 0 ; <nl> + cout < < " This - 1 example should have low probability . Its probability is : " < < learned_pfunct ( sample ) < < endl ; <nl> + <nl> + <nl> + <nl> + / / Another thing that is worth knowing is that just about everything in dlib is serializable . <nl> + / / So for example , you can save the learned_pfunct object to disk and recall it later like so : <nl> + ofstream fout ( " saved_function . dat " , ios : : binary ) ; <nl> + serialize ( learned_pfunct , fout ) ; <nl> + fout . close ( ) ; <nl> + <nl> + / / now lets open that file back up and load the function object it contains <nl> + ifstream fin ( " saved_function . dat " , ios : : binary ) ; <nl> + deserialize ( learned_pfunct , fin ) ; <nl> + <nl> + <nl> + } <nl> + <nl> new file mode 100644 <nl> index 000000000 . . 7f13ea0e9 <nl> mmm / dev / null <nl> ppp b / examples / krr_regression_ex . cpp <nl> <nl> + / / The contents of this file are in the public domain . See LICENSE_FOR_EXAMPLE_PROGRAMS . txt <nl> + / * <nl> + This is an example illustrating the use of the kernel ridge regression <nl> + object from the dlib C + + Library . <nl> + <nl> + This example will train on data from the sinc function . <nl> + <nl> + * / <nl> + <nl> + # include < iostream > <nl> + # include < vector > <nl> + <nl> + # include " dlib / svm . h " <nl> + <nl> + using namespace std ; <nl> + using namespace dlib ; <nl> + <nl> + / / Here is the sinc function we will be trying to learn with kernel ridge regression <nl> + double sinc ( double x ) <nl> + { <nl> + if ( x = = 0 ) <nl> + return 1 ; <nl> + return sin ( x ) / x ; <nl> + } <nl> + <nl> + int main ( ) <nl> + { <nl> + / / Here we declare that our samples will be 1 dimensional column vectors . <nl> + typedef matrix < double , 1 , 1 > sample_type ; <nl> + <nl> + / / Now sample some points from the sinc ( ) function <nl> + sample_type m ; <nl> + std : : vector < sample_type > samples ; <nl> + std : : vector < double > labels ; <nl> + for ( double x = - 10 ; x < = 4 ; x + = 1 ) <nl> + { <nl> + m ( 0 ) = x ; <nl> + samples . push_back ( m ) ; <nl> + labels . push_back ( sinc ( x ) ) ; <nl> + } <nl> + <nl> + / / Now we are making a typedef for the kind of kernel we want to use . I picked the <nl> + / / radial basis kernel because it only has one parameter and generally gives good <nl> + / / results without much fiddling . <nl> + typedef radial_basis_kernel < sample_type > kernel_type ; <nl> + <nl> + / / Here we declare an instance of the krr_trainer object . This is the <nl> + / / object that we will later use to do the training . <nl> + krr_trainer < kernel_type > trainer ; <nl> + <nl> + / / Here we set the kernel we want to use for training . The radial_basis_kernel <nl> + / / has a parameter called gamma that we need to determine . As a rule of thumb , a good <nl> + / / gamma to try is 1 . 0 / ( mean squared distance between your sample points ) . So <nl> + / / below we are using a similar value . <nl> + const double gamma = 3 . 0 / compute_mean_squared_distance ( samples ) ; <nl> + cout < < " using gamma of " < < gamma < < endl ; <nl> + trainer . set_kernel ( kernel_type ( gamma ) ) ; <nl> + <nl> + / / now train a function based on our sample points <nl> + decision_function < kernel_type > test = trainer . train ( samples , labels ) ; <nl> + <nl> + / / now we output the value of the sinc function for a few test points as well as the <nl> + / / value predicted by our regression . <nl> + m ( 0 ) = 2 . 5 ; cout < < sinc ( m ( 0 ) ) < < " " < < test ( m ) < < endl ; <nl> + m ( 0 ) = 0 . 1 ; cout < < sinc ( m ( 0 ) ) < < " " < < test ( m ) < < endl ; <nl> + m ( 0 ) = - 4 ; cout < < sinc ( m ( 0 ) ) < < " " < < test ( m ) < < endl ; <nl> + m ( 0 ) = 5 . 0 ; cout < < sinc ( m ( 0 ) ) < < " " < < test ( m ) < < endl ; <nl> + <nl> + / / The output is as follows : <nl> + / / using gamma of 0 . 075 <nl> + / / 0 . 239389 0 . 239388 <nl> + / / 0 . 998334 0 . 998363 <nl> + / / - 0 . 189201 - 0 . 189254 <nl> + / / - 0 . 191785 - 0 . 186669 <nl> + <nl> + / / The first column is the true value of the sinc function and the second <nl> + / / column is the output from the krr estimate . <nl> + <nl> + <nl> + / / Note that the krr_trainer has the ability to tell us the leave - one - out cross - validation <nl> + / / accuracy . The train ( ) function has an optional 3rd argument and if we give it a double <nl> + / / it will give us back the LOO error . <nl> + double loo_error ; <nl> + trainer . train ( samples , labels , loo_error ) ; <nl> + cout < < " mean squared LOO error : " < < loo_error < < endl ; <nl> + / / Which outputs the following : <nl> + / / mean squared LOO error : 8 . 29813e - 07 <nl> + <nl> + <nl> + <nl> + <nl> + / / Another thing that is worth knowing is that just about everything in dlib is serializable . <nl> + / / So for example , you can save the test object to disk and recall it later like so : <nl> + ofstream fout ( " saved_function . dat " , ios : : binary ) ; <nl> + serialize ( test , fout ) ; <nl> + fout . close ( ) ; <nl> + <nl> + / / now lets open that file back up and load the function object it contains <nl> + ifstream fin ( " saved_function . dat " , ios : : binary ) ; <nl> + deserialize ( test , fin ) ; <nl> + <nl> + <nl> + } <nl> + <nl> + <nl>
|
Added some examples for kernel ridge regression .
|
davisking/dlib
|
1d204e791676017be47656fa292e6bd027e3f067
|
2010-07-24T00:38:22Z
|
mmm a / include / grpc + + / client_context . h <nl> ppp b / include / grpc + + / client_context . h <nl> class ClientContext { <nl> / / / a client context is constructed and destructed . <nl> class GlobalCallbacks { <nl> public : <nl> - virtual GlobalCallbacks ( ) { } <nl> + virtual ~ GlobalCallbacks ( ) { } <nl> virtual void DefaultConstructor ( ClientContext * context ) = 0 ; <nl> virtual void Destructor ( ClientContext * context ) = 0 ; <nl> } ; <nl>
|
Fix the typo
|
grpc/grpc
|
33a1ad002a8edcee8d86c39161d142b94ec0a739
|
2016-01-12T23:56:21Z
|
mmm a / README . md <nl> ppp b / README . md <nl> make patches much more easily , so we highly encourage it . <nl> <nl> # # # Source Package # # # <nl> <nl> - Snapshots of Google Test ' s master branch can be <nl> - [ https : / / github . com / google / googletest / archive / master . zip ] ( downloaded directly ) . <nl> + Snapshots of Google Test ' s master branch can be <nl> + [ downloaded directly ] ( https : / / github . com / google / googletest / archive / master . zip ) . <nl> <nl> Versioned releases are also available by clicking on <nl> - [ https : / / github . com / google / googletest / releases ] ( Releases ) in the project page . <nl> + [ Releases ] ( https : / / github . com / google / googletest / releases ) in the project page . <nl> <nl> # # # Git Checkout # # # <nl> <nl> for how to use it . <nl> <nl> We welcome patches . Please read the <nl> [ Google Test developer ' s guide ] ( <nl> - http : / / code . google . com / p / googletest / wiki / GoogleTestDevGuide ) <nl> + http : / / code . google . com / p / googletest / wiki / DevGuide ) <nl> for how you can contribute . In particular , make sure you have signed <nl> the Contributor License Agreement , or we won ' t be able to accept the <nl> patch . <nl>
|
Merge pull request from dhood / master
|
google/googletest
|
6e981455c3f92038c09fbf7f03bd8e4042484050
|
2015-08-24T16:34:21Z
|
mmm a / guilib / GUIControlGroup . cpp <nl> ppp b / guilib / GUIControlGroup . cpp <nl> bool CGUIControlGroup : : SendMouseEvent ( const CPoint & point , const CMouseEvent & ev <nl> / / transform our position into child coordinates <nl> CPoint childPoint ( point ) ; <nl> m_transform . InverseTransformPosition ( childPoint . x , childPoint . y ) ; <nl> - childPoint - = GetPosition ( ) ; <nl> <nl> if ( CGUIControl : : CanFocus ( ) ) <nl> { <nl> + CPoint pos ( GetPosition ( ) ) ; <nl> / / run through our controls in reverse order ( so that last rendered is checked first ) <nl> for ( rControls i = m_children . rbegin ( ) ; i ! = m_children . rend ( ) ; + + i ) <nl> { <nl> CGUIControl * child = * i ; <nl> - if ( child - > SendMouseEvent ( childPoint , event ) ) <nl> + if ( child - > SendMouseEvent ( childPoint - pos , event ) ) <nl> { / / we ' ve handled the action , and / or have focused an item <nl> return true ; <nl> } <nl>
|
fixed : Don ' t pass position - adjusted coordinates to the group ' s mouse handler - < hitrect > is in terms of the parent ' s coords .
|
xbmc/xbmc
|
5e7705c2c39ec3893d6ea64b7471a31dfe1f462f
|
2010-01-12T04:18:20Z
|
mmm a / setup - utils / install - mxnet - osx - python . sh <nl> ppp b / setup - utils / install - mxnet - osx - python . sh <nl> <nl> <nl> # set - ex <nl> <nl> + export TARIKH = ` / bin / date + % Y - % m - % d - % H : % M : % S ` <nl> export MXNET_HOME = " $ HOME / mxnet " <nl> + export MXNET_HOME_OLD = " $ HOME / mxnet_ $ { TARIKH } " <nl> export MXNET_LOG = $ { MXNET_HOME } / buildMXNet_mac . log <nl> # Insert the Homebrew directory at the top of your PATH environment variable <nl> export PATH = / usr / local / bin : / usr / local / sbin : $ PATH <nl> LINE = " # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # " <nl> <nl> echo $ LINE <nl> echo " " <nl> - echo " This script installs MXNet on MacOS . " <nl> + echo " This script installs MXNet on MacOS in $ { MXNET_HOME } " <nl> + echo " If this directory is already present , it is renamed to $ { MXNET_HOME_OLD } " <nl> echo " It has been tested to work successfully on MacOS El Capitan and Sierra " <nl> echo " and is expected to work fine on other versions as well . " <nl> echo " " <nl> + echo " Approximate run - time is around 5 minutes . " <nl> + echo " " <nl> echo $ LINE <nl> sleep 2 <nl> <nl> runme ( ) { <nl> fi <nl> } <nl> <nl> + download_mxnet ( ) { <nl> + if [ - d $ { MXNET_HOME } ] ; then <nl> + echo " Renaming directory $ { MXNET_HOME } to $ { MXNET_HOME_OLD } " <nl> + mv $ { MXNET_HOME } $ { MXNET_HOME_OLD } <nl> + fi <nl> + echo " Downloading MXNET source repositories from github " <nl> + git clone https : / / github . com / dmlc / mxnet . git $ { MXNET_HOME } - - recursive <nl> + } <nl> + <nl> + download_mxnet <nl> runme brew update <nl> runme brew_pkg_install pkg - config <nl> runme brew_pkg_install python <nl>
|
Update osx installation script to move ~ / mxnet if present ( )
|
apache/incubator-mxnet
|
35aa93d3c0b46f61581dca7af908531825c2cee2
|
2017-05-01T00:45:13Z
|
mmm a / hphp / compiler / analysis / emitter . cpp <nl> ppp b / hphp / compiler / analysis / emitter . cpp <nl> FuncEmitter * EmitterVisitor : : createInOutWrapper ( MethodStatementPtr m , <nl> auto const nonClosureMethod = fe - > pce ( ) & & ! fe - > isClosureBody ; <nl> <nl> / / For now we cannot support inout parameters on generators , async functions , <nl> - / / functions which return by ref , and non - closure methods when reffiness is <nl> - / / not invariant on method overrides . Additionally , we don ' t emit wrappers <nl> + / / functions which return by ref , variadic byref parameters and non - closure <nl> + / / methods when reffiness is not invariant on method overrides . <nl> + / / Additionally , we don ' t emit wrappers <nl> / / for non < ? hh files unless EnableHipHopSyntax is set . <nl> auto const needIOWrapper = <nl> RuntimeOption : : EvalCreateInOutWrapperFunctions & & <nl> FuncEmitter * EmitterVisitor : : createInOutWrapper ( MethodStatementPtr m , <nl> ! scope - > isAsync ( ) & & <nl> ! scope - > isGenerator ( ) & & <nl> ! scope - > isAbstract ( ) & & <nl> + ! scope - > hasRefVariadicParam ( ) & & <nl> ! m - > isRef ( ) ; <nl> <nl> / / InOut functions must always have a wrapper created for them , however , ref <nl> mmm a / hphp / hack / src / hhbc / closure_convert . ml <nl> ppp b / hphp / hack / src / hhbc / closure_convert . ml <nl> and convert_stmt env st ( p , stmt_ as stmt ) : _ * stmt = <nl> | Fun fd : : _defs - > <nl> let st , fd = convert_fun env st fd in <nl> let has_inout_params = <nl> - let wrapper , _ = Emit_inout_helpers . extract_inout_or_ref_param_locations <nl> - ~ is_closure_or_func : true <nl> - fd . Ast . f_params in <nl> + let wrapper , _ = <nl> + Emit_inout_helpers . extract_function_inout_or_ref_param_locations fd in <nl> Option . is_some wrapper in <nl> let st , stub_fd = <nl> add_function ~ has_inout_params : has_inout_params env st fd in <nl> mmm a / hphp / hack / src / hhbc / emit_function . ml <nl> ppp b / hphp / hack / src / hhbc / emit_function . ml <nl> open Instruction_sequence <nl> module A = Ast <nl> open Hh_core <nl> <nl> - let extract_inout_or_ref_param_locations params = <nl> - let module EIOH = Emit_inout_helpers in <nl> - EIOH . extract_inout_or_ref_param_locations ~ is_closure_or_func : true params <nl> - <nl> ( * Given a function definition , emit code , and in the case of < < __Memoize > > , <nl> * a wrapper function <nl> * ) <nl> let emit_function : A . fun_ * bool - > Hhas_function . t list = <nl> let deprecation_info = Hhas_attribute . deprecation_info function_attributes in <nl> let is_dynamically_callable = Hhas_attribute . is_dynamically_callable function_attributes in <nl> let wrapper_type_opt , inout_param_locations = <nl> - extract_inout_or_ref_param_locations ast_fun . Ast . f_params in <nl> + Emit_inout_helpers . extract_function_inout_or_ref_param_locations ast_fun in <nl> let has_inout_args = Option . is_some wrapper_type_opt in <nl> let renamed_id = <nl> if is_memoize <nl> let emit_function : A . fun_ * bool - > Hhas_function . t list = <nl> let normal_function_name = <nl> if wrapper_type_opt = Some Emit_inout_helpers . RefWrapper <nl> then original_id else renamed_id in <nl> - let is_interceptable = Interceptable . is_function_interceptable <nl> - ~ is_generated : false namespace ast_fun in <nl> + let is_interceptable = <nl> + Interceptable . is_function_interceptable namespace ast_fun in <nl> let normal_function = <nl> Hhas_function . make <nl> function_attributes <nl> mmm a / hphp / hack / src / hhbc / emit_inout_function . ml <nl> ppp b / hphp / hack / src / hhbc / emit_inout_function . ml <nl> open Hhbc_ast <nl> <nl> module H = Hhbc_ast <nl> <nl> + let is_last_param_variadic param_count params = <nl> + let last_p = List . nth_exn params ( param_count - 1 ) in <nl> + Hhas_param . is_variadic last_p <nl> + <nl> let emit_body_instrs_inout params call_instrs = <nl> let param_count = List . length params in <nl> let param_instrs = gather @ @ <nl> let emit_body_instrs_inout params call_instrs = <nl> Some ( instr_setl @ @ Local . Named ( Hhas_param . name p ) ) ) in <nl> let msrv = Hhbc_options . use_msrv_for_inout ! Hhbc_options . compiler_options in <nl> let local = Local . get_unnamed_local ( ) in <nl> - let last_p = List . nth_exn params ( param_count - 1 ) in <nl> - let has_variadic = Hhas_param . is_variadic last_p in <nl> + let has_variadic = is_last_param_variadic param_count params in <nl> let num_inout = List . length inout_params in <nl> let num_uninit = if msrv then num_inout else 0 in <nl> gather [ <nl> let emit_body_instrs_ref params call_instrs = <nl> let param_get_instrs = <nl> List . filter_map params ~ f : ( fun p - > <nl> if Hhas_param . is_reference p <nl> - then Some ( instr_cgetl ( Local . Named ( Hhas_param . name p ) ) ) else None ) <nl> + then Some ( instr_cgetl ( Local . Named ( Hhas_param . name p ) ) ) else None ) in <nl> + let fcall_instr = <nl> + if is_last_param_variadic param_count params <nl> + then instr_fcallunpack param_count <nl> + else instr_fcall param_count <nl> in <nl> gather [ <nl> call_instrs ; <nl> param_instrs ; <nl> - instr_fcall param_count ; <nl> + fcall_instr ; <nl> instr_unboxr_nop ; <nl> gather param_get_instrs ; <nl> if msrv then <nl> let emit_wrapper_function <nl> make_wrapper_body <nl> env doc decl_vars return_type_info modified_params body_instrs in <nl> let return_by_ref = ast_fun . Ast . f_ret_by_ref in <nl> - let is_interceptable = Interceptable . is_function_interceptable <nl> - ~ is_generated : true namespace ast_fun in <nl> + let is_interceptable = <nl> + Interceptable . is_function_interceptable namespace ast_fun in <nl> Hhas_function . make <nl> function_attributes <nl> name <nl> let emit_wrapper_method <nl> let doc = ast_method . A . m_doc_comment in <nl> let body = <nl> make_wrapper_body env doc decl_vars return_type_info params body_instrs in <nl> - let method_is_interceptable = Interceptable . is_method_interceptable <nl> - ~ is_generated : true namespace ast_class original_id in <nl> + let method_is_interceptable = <nl> + Interceptable . is_method_interceptable namespace ast_class original_id in <nl> Hhas_method . make <nl> method_attributes <nl> method_is_protected <nl> mmm a / hphp / hack / src / hhbc / emit_inout_helpers . ml <nl> ppp b / hphp / hack / src / hhbc / emit_inout_helpers . ml <nl> module H = Hhbc_ast <nl> <nl> type wrapper_type = InoutWrapper | RefWrapper <nl> <nl> - let extract_inout_or_ref_param_locations ~ is_closure_or_func params = <nl> + let extract_inout_or_ref_param_locations ~ is_sync ~ is_byref ~ is_closure_or_func params = <nl> let inout_param_locations = List . filter_mapi params <nl> ~ f : ( fun i p - > if p . Ast . param_callconv < > Some Ast . Pinout <nl> then None else Some i ) in <nl> if List . length inout_param_locations < > 0 then <nl> Some InoutWrapper , inout_param_locations <nl> else <nl> + if not is_sync | | is_byref <nl> + then None , [ ] <nl> + else <nl> let module O = Hhbc_options in <nl> let need_wrapper = <nl> O . create_inout_wrapper_functions ! O . compiler_options <nl> & & ( Emit_env . is_hh_syntax_enabled ( ) ) <nl> - & & ( O . reffiness_invariance ! O . compiler_options | | is_closure_or_func ) in <nl> + & & ( O . reffiness_invariance ! O . compiler_options | | is_closure_or_func ) <nl> + & & not @ @ List . exists params <nl> + ~ f : ( fun p - > p . Ast . param_is_variadic & & p . Ast . param_is_reference ) in <nl> let l = <nl> if need_wrapper <nl> then List . filter_mapi params ~ f : ( fun i p - > Option . some_if p . Ast . param_is_reference i ) <nl> let extract_inout_or_ref_param_locations ~ is_closure_or_func params = <nl> if List . is_empty l then None , [ ] <nl> else Some RefWrapper , l <nl> <nl> + let extract_function_inout_or_ref_param_locations fd = <nl> + let is_byref = fd . Ast . f_ret_by_ref in <nl> + let is_sync = fd . Ast . f_fun_kind = Ast . FSync in <nl> + extract_inout_or_ref_param_locations <nl> + ~ is_byref <nl> + ~ is_closure_or_func : true <nl> + ~ is_sync <nl> + fd . Ast . f_params <nl> + <nl> + let extract_method_inout_or_ref_param_locations md ~ is_closure_or_func = <nl> + let is_byref = md . Ast . m_ret_by_ref in <nl> + let is_sync = md . Ast . m_fun_kind = Ast . FSync in <nl> + extract_inout_or_ref_param_locations <nl> + ~ is_byref <nl> + ~ is_closure_or_func <nl> + ~ is_sync <nl> + md . Ast . m_params <nl> + <nl> let inout_suffix param_location = <nl> let param_location = List . map ~ f : string_of_int param_location in <nl> " $ " <nl> mmm a / hphp / hack / src / hhbc / emit_memoize_function . ml <nl> ppp b / hphp / hack / src / hhbc / emit_memoize_function . ml <nl> let emit_wrapper_function <nl> in <nl> let memoized_body = <nl> make_wrapper_body env return_type_info is_dynamically_callable params body_instrs in <nl> - let is_interceptable = Interceptable . is_function_interceptable <nl> - ~ is_generated : true namespace ast_fun in <nl> + let is_interceptable = Interceptable . is_function_interceptable namespace ast_fun in <nl> Hhas_function . make <nl> function_attributes <nl> original_id <nl> mmm a / hphp / hack / src / hhbc / emit_memoize_method . ml <nl> ppp b / hphp / hack / src / hhbc / emit_memoize_method . ml <nl> let make_memoize_wrapper_method env info index ast_class ast_method = <nl> [ Ast_scope . ScopeItem . Method ast_method ; <nl> Ast_scope . ScopeItem . Class ast_class ] in <nl> let namespace = ast_class . Ast . c_namespace in <nl> - let method_is_interceptable = Interceptable . is_method_interceptable <nl> - ~ is_generated : true namespace ast_class method_id in <nl> + let method_is_interceptable = <nl> + Interceptable . is_method_interceptable namespace ast_class method_id in <nl> let method_body = <nl> emit_memoize_wrapper_body env info index ast_method <nl> ~ scope ~ namespace is_dynamically_callable ast_method . Ast . m_params ret in <nl> mmm a / hphp / hack / src / hhbc / emit_method . ml <nl> ppp b / hphp / hack / src / hhbc / emit_method . ml <nl> let rec hint_uses_tparams tparam_names ( _ , hint ) = <nl> ( * Extracts inout params <nl> * Or ref params only if the function is a closure <nl> * ) <nl> - let extract_inout_or_ref_param_locations is_closure params = <nl> - let module EIOH = Emit_inout_helpers in <nl> + let extract_inout_or_ref_param_locations is_closure_or_func md = <nl> let _ , l = <nl> - EIOH . extract_inout_or_ref_param_locations ~ is_closure_or_func : is_closure params in <nl> + Emit_inout_helpers . extract_method_inout_or_ref_param_locations <nl> + ~ is_closure_or_func md in <nl> l <nl> <nl> let has_kind m k = List . mem m . Ast . m_kind k <nl> let from_ast_wrapper : bool - > _ - > <nl> if id = SN . SpecialIdents . this then <nl> Emit_fatal . raise_fatal_parse pos " Cannot re - assign $ this " ) ; <nl> let inout_param_locations = <nl> - extract_inout_or_ref_param_locations method_is_closure_body ast_method . Ast . m_params in <nl> + extract_inout_or_ref_param_locations method_is_closure_body ast_method in <nl> let has_inout_args = List . length inout_param_locations < > 0 in <nl> let renamed_method_id = if has_inout_args then <nl> Hhbc_id . Method . from_ast_name @ @ <nl> let from_ast_wrapper : bool - > _ - > <nl> let method_id = <nl> if has_inout_args & & ( method_is_closure_body | | has_ref_params ) then <nl> original_method_id else renamed_method_id in <nl> - let method_is_interceptable = Interceptable . is_method_interceptable <nl> - ~ is_generated : ( method_id < > renamed_method_id ) namespace ast_class original_method_id in <nl> + let method_is_interceptable = <nl> + Interceptable . is_method_interceptable namespace ast_class original_method_id in <nl> let normal_function = <nl> Hhas_method . make <nl> method_attributes <nl> mmm a / hphp / hack / src / hhbc / emit_statement . ml <nl> ppp b / hphp / hack / src / hhbc / emit_statement . ml <nl> let emit_def_inline = function <nl> | A . Fun fd - > <nl> let has_inout_params = <nl> let r , _ = <nl> - Emit_inout_helpers . extract_inout_or_ref_param_locations <nl> - ~ is_closure_or_func : true <nl> - fd . Ast . f_params in <nl> + Emit_inout_helpers . extract_function_inout_or_ref_param_locations fd in <nl> Option . is_some r in <nl> Emit_pos . emit_pos_then ( fst fd . Ast . f_name ) @ @ <nl> let n = int_of_string ( snd fd . Ast . f_name ) in <nl> mmm a / hphp / hack / src / hhbc / interceptable . ml <nl> ppp b / hphp / hack / src / hhbc / interceptable . ml <nl> <nl> * <nl> * ) <nl> <nl> - let is_method_interceptable ~ is_generated namespace ast_class original_id = <nl> + let is_method_interceptable namespace ast_class original_id = <nl> let open Hhbc_options in <nl> let difs = dynamic_invoke_functions ! compiler_options in <nl> - not is_generated & & <nl> - ( jit_enable_rename_function ! compiler_options | | <nl> - ( not ( SSet . is_empty difs ) & & <nl> - let class_id , _ = Hhbc_id . Class . elaborate_id namespace ast_class . Ast . c_name in <nl> - let class_name = Hhbc_id . Class . to_unmangled_string class_id in <nl> - let method_name = Hhbc_id . Method . to_raw_string original_id in <nl> - let name = String . lowercase_ascii ( class_name ^ " : : " ^ method_name ) in <nl> - SSet . mem name difs ) ) <nl> + ( jit_enable_rename_function ! compiler_options | | <nl> + ( not ( SSet . is_empty difs ) & & <nl> + let class_id , _ = Hhbc_id . Class . elaborate_id namespace ast_class . Ast . c_name in <nl> + let class_name = Hhbc_id . Class . to_unmangled_string class_id in <nl> + let method_name = Hhbc_id . Method . to_raw_string original_id in <nl> + let name = String . lowercase_ascii ( class_name ^ " : : " ^ method_name ) in <nl> + SSet . mem name difs ) ) <nl> <nl> - let is_function_interceptable ~ is_generated namespace ast_fun = <nl> + let is_function_interceptable namespace ast_fun = <nl> let open Hhbc_options in <nl> let difs = dynamic_invoke_functions ! compiler_options in <nl> - not is_generated & & <nl> - ( ( not ( repo_authoritative ! compiler_options ) & & <nl> - ( jit_enable_rename_function ! compiler_options ) ) | | <nl> - ( not ( SSet . is_empty difs ) & & <nl> - let fq_id , _ = <nl> - Hhbc_id . Function . elaborate_id_with_builtins namespace ast_fun . Ast . f_name in <nl> - let name = String . lowercase_ascii ( Hhbc_id . Function . to_raw_string fq_id ) in <nl> - SSet . mem name difs ) ) <nl> + ( ( not ( repo_authoritative ! compiler_options ) & & <nl> + ( jit_enable_rename_function ! compiler_options ) ) | | <nl> + ( not ( SSet . is_empty difs ) & & <nl> + let fq_id , _ = <nl> + Hhbc_id . Function . elaborate_id_with_builtins namespace ast_fun . Ast . f_name in <nl> + let name = String . lowercase_ascii ( Hhbc_id . Function . to_raw_string fq_id ) in <nl> + SSet . mem name difs ) ) <nl> new file mode 100644 <nl> index 00000000000 . . d740b3e0c56 <nl> mmm / dev / null <nl> ppp b / hphp / test / quick / variadic_byref1 . php <nl> <nl> + < ? php <nl> + <nl> + function variadic_by_ref ( & . . . $ args ) { <nl> + foreach ( $ args as & $ a ) { $ a + + ; } <nl> + } <nl> + <nl> + function main ( ) { <nl> + $ a = 10 ; <nl> + $ b = 20 ; <nl> + variadic_by_ref ( $ a , $ b ) ; <nl> + var_dump ( $ a , $ b ) ; <nl> + } <nl> + main ( ) ; <nl> new file mode 100644 <nl> index 00000000000 . . d61813ae1e0 <nl> mmm / dev / null <nl> ppp b / hphp / test / quick / variadic_byref1 . php . expect <nl> <nl> + int ( 11 ) <nl> + int ( 21 ) <nl> new file mode 100644 <nl> index 00000000000 . . 5668b060c31 <nl> mmm / dev / null <nl> ppp b / hphp / test / quick / variadic_byref1 . php . opts <nl> @ @ - 0 , 0 + 1 @ @ <nl> + - v Eval . CreateInOutWrapperFunctions = 1 <nl> mmm a / hphp / test / run <nl> ppp b / hphp / test / run <nl> function hhvm_cmd_impl ( ) { <nl> $ args [ ] = ' - vEval . DisableHphpcOpts = 1 ' ; <nl> } <nl> $ args [ ] = ' - vEval . DisassemblerSourceMapping = 1 ' ; <nl> - $ args [ ] = ' - vEval . CreateInOutWrapperFunctions = 0 ' ; <nl> + $ args [ ] = ' - vEval . CreateInOutWrapperFunctions = 1 ' ; <nl> + $ args [ ] = ' - vEval . ReffinessInvariance = 1 ' ; <nl> <nl> / / TODO ( paulbiss ) : support these <nl> $ args [ ] = ' - vEval . DisassemblerPropDocComments = 0 ' ; <nl>
|
Do not generate IO wrappers for functions that contain byref variadic parameters
|
facebook/hhvm
|
93190f117d6c3b4a1b0b055dbb3c189746da813c
|
2018-02-26T17:12:23Z
|
mmm a / dbms / src / TableFunctions / TableFunctionRemote . cpp <nl> ppp b / dbms / src / TableFunctions / TableFunctionRemote . cpp <nl> StoragePtr TableFunctionRemote : : executeImpl ( const ASTPtr & ast_function , const C <nl> setIdentifierSpecial ( ast ) ; <nl> <nl> ClusterPtr cluster ; <nl> - if ( ! cluster_name . empty ( ) & & name ! = " clusterAllReplicas " ) <nl> + if ( ! cluster_name . empty ( ) ) <nl> { <nl> / / / Use an existing cluster from the main config <nl> - cluster = context . getCluster ( cluster_name ) ; <nl> - } <nl> - else if ( ! cluster_name . empty ( ) & & name = = " clusterAllReplicas " ) <nl> - { <nl> - std : : vector < std : : vector < String > > clusterNodes ; <nl> - cluster = context . getCluster ( cluster_name ) ; <nl> - / / creating a new topology for clusterAllReplicas <nl> - const auto & addresses_with_failovers = cluster - > getShardsAddresses ( ) ; <nl> - const auto & shards_info = cluster - > getShardsInfo ( ) ; <nl> - auto maybe_secure_port = context . getTCPPortSecure ( ) ; <nl> - <nl> - for ( size_t shard_index : ext : : range ( 0 , shards_info . size ( ) ) ) <nl> - { <nl> - const auto & replicas = addresses_with_failovers [ shard_index ] ; <nl> - for ( size_t replica_index : ext : : range ( 0 , replicas . size ( ) ) ) <nl> - { <nl> - std : : vector < String > newNode = { replicas [ replica_index ] . host_name } ; <nl> - clusterNodes . push_back ( newNode ) ; <nl> - } <nl> - } <nl> - cluster = std : : make_shared < Cluster > ( <nl> - context . getSettings ( ) , <nl> - clusterNodes , <nl> - username , <nl> - password , <nl> - ( secure ? ( maybe_secure_port ? * maybe_secure_port : DBMS_DEFAULT_SECURE_PORT ) : context . getTCPPort ( ) ) , <nl> - false , <nl> - secure ) ; <nl> + if ( name ! = " clusterAllReplicas " ) <nl> + cluster = context . getCluster ( cluster_name ) ; <nl> + else <nl> + cluster = context . getCluster ( cluster_name ) - > getClusterWithReplicasAsShards ( context . getSettings ( ) ) ; <nl> } <nl> else <nl> { <nl> StoragePtr TableFunctionRemote : : executeImpl ( const ASTPtr & ast_function , const C <nl> { <nl> size_t colon = host . find ( ' : ' ) ; <nl> if ( colon = = String : : npos ) <nl> - context . getRemoteHostFilter ( ) . checkHostAndPort ( host , toString ( ( secure ? ( maybe_secure_port ? * maybe_secure_port : DBMS_DEFAULT_SECURE_PORT ) : context . getTCPPort ( ) ) ) ) ; <nl> + context . getRemoteHostFilter ( ) . checkHostAndPort ( <nl> + host , <nl> + toString ( ( secure ? ( maybe_secure_port ? * maybe_secure_port : DBMS_DEFAULT_SECURE_PORT ) : context . getTCPPort ( ) ) ) ) ; <nl> else <nl> context . getRemoteHostFilter ( ) . checkHostAndPort ( host . substr ( 0 , colon ) , host . substr ( colon + 1 ) ) ; <nl> } <nl> } <nl> <nl> - cluster = std : : make_shared < Cluster > ( context . getSettings ( ) , names , username , password , ( secure ? ( maybe_secure_port ? * maybe_secure_port : DBMS_DEFAULT_SECURE_PORT ) : context . getTCPPort ( ) ) , false , secure ) ; <nl> + cluster = std : : make_shared < Cluster > ( <nl> + context . getSettings ( ) , <nl> + names , <nl> + username , <nl> + password , <nl> + ( secure ? ( maybe_secure_port ? * maybe_secure_port : DBMS_DEFAULT_SECURE_PORT ) : context . getTCPPort ( ) ) , <nl> + false , <nl> + secure ) ; <nl> } <nl> <nl> auto structure_remote_table = getStructureOfRemoteTable ( * cluster , remote_database , remote_table , context , remote_table_function_ptr ) ; <nl>
|
altered flow for clusterAllreplicas table function
|
ClickHouse/ClickHouse
|
1ac7ed5abc42c2779a2b1a5b70d7c09356e92aab
|
2020-01-07T10:26:53Z
|
mmm a / src / bootstrapper . cc <nl> ppp b / src / bootstrapper . cc <nl> Genesis : : Genesis ( <nl> isolate - > set_context ( * native_context ( ) ) ; <nl> isolate - > counters ( ) - > contexts_created_by_snapshot ( ) - > Increment ( ) ; <nl> if ( FLAG_trace_maps ) { <nl> + DisallowHeapAllocation no_gc ; <nl> Handle < JSFunction > object_fun = isolate - > object_function ( ) ; <nl> - int sfi_id = - 1 ; <nl> - # if V8_SFI_HAS_UNIQUE_ID <nl> - sfi_id = object_fun - > shared ( ) - > unique_id ( ) ; <nl> - # endif / / V8_SFI_HAS_UNIQUE_ID <nl> - PrintF ( " [ TraceMap : InitialMap map = % p SFI = % d_Object ] \ n " , <nl> - reinterpret_cast < void * > ( object_fun - > initial_map ( ) ) , sfi_id ) ; <nl> - Map : : TraceAllTransitions ( object_fun - > initial_map ( ) ) ; <nl> + Map * initial_map = object_fun - > initial_map ( ) ; <nl> + LOG ( isolate , MapDetails ( initial_map ) ) ; <nl> + LOG ( isolate , MapEvent ( " InitialMap " , nullptr , initial_map , " Object " , <nl> + object_fun - > shared ( ) ) ) ; <nl> + LOG ( isolate , LogAllTransitions ( initial_map ) ) ; <nl> } <nl> <nl> if ( context_snapshot_index = = 0 ) { <nl> mmm a / src / flag - definitions . h <nl> ppp b / src / flag - definitions . h <nl> DEFINE_BOOL ( trace_prototype_users , false , <nl> DEFINE_BOOL ( use_verbose_printer , true , " allows verbose printing " ) <nl> DEFINE_BOOL ( trace_for_in_enumerate , false , " Trace for - in enumerate slow - paths " ) <nl> DEFINE_BOOL ( trace_maps , false , " trace map creation " ) <nl> + DEFINE_IMPLICATION ( trace_maps , log_code ) <nl> <nl> / / parser . cc <nl> DEFINE_BOOL ( allow_natives_syntax , false , " allow natives syntax " ) <nl> mmm a / src / log - utils . cc <nl> ppp b / src / log - utils . cc <nl> void Log : : MessageBuilder : : AppendString ( String * str ) { <nl> } <nl> <nl> void Log : : MessageBuilder : : AppendString ( const char * string ) { <nl> + if ( string = = nullptr ) return ; <nl> for ( const char * p = string ; * p ! = ' \ 0 ' ; p + + ) { <nl> this - > AppendCharacter ( * p ) ; <nl> } <nl> mmm a / src / log . cc <nl> ppp b / src / log . cc <nl> void Logger : : ICEvent ( const char * type , bool keyed , Map * map , Object * key , <nl> msg . WriteToLogFile ( ) ; <nl> } <nl> <nl> + void Logger : : LogAllTransitions ( Map * map ) { <nl> + DisallowHeapAllocation no_gc ; <nl> + if ( ! log_ - > IsEnabled ( ) | | ! FLAG_trace_maps ) return ; <nl> + TransitionsAccessor transitions ( map , & no_gc ) ; <nl> + int num_transitions = transitions . NumberOfTransitions ( ) ; <nl> + for ( int i = 0 ; i < num_transitions ; + + i ) { <nl> + Map * target = transitions . GetTarget ( i ) ; <nl> + Name * key = transitions . GetKey ( i ) ; <nl> + MapDetails ( target ) ; <nl> + MapEvent ( " Transition " , map , target , nullptr , key ) ; <nl> + LogAllTransitions ( target ) ; <nl> + } <nl> + } <nl> + <nl> + void Logger : : MapEvent ( const char * type , Map * from , Map * to , const char * reason , <nl> + HeapObject * name_or_sfi ) { <nl> + DisallowHeapAllocation no_gc ; <nl> + if ( ! log_ - > IsEnabled ( ) | | ! FLAG_trace_maps ) return ; <nl> + / / TODO ( cbruni ) : Remove once - - trace - maps is fully migrated . <nl> + if ( from ) MapDetails ( from ) ; <nl> + if ( to ) MapDetails ( to ) ; <nl> + int line = - 1 ; <nl> + int column = - 1 ; <nl> + Address pc = 0 ; <nl> + if ( ! isolate_ - > bootstrapper ( ) - > IsActive ( ) ) { <nl> + pc = isolate_ - > GetAbstractPC ( & line , & column ) ; <nl> + } <nl> + Log : : MessageBuilder msg ( log_ ) ; <nl> + msg < < " map " < < kNext < < type < < kNext < < timer_ . Elapsed ( ) . InMicroseconds ( ) <nl> + < < kNext < < reinterpret_cast < void * > ( from ) < < kNext <nl> + < < reinterpret_cast < void * > ( to ) < < kNext < < reinterpret_cast < void * > ( pc ) <nl> + < < kNext < < line < < kNext < < column < < kNext < < reason < < kNext ; <nl> + <nl> + if ( name_or_sfi ) { <nl> + if ( name_or_sfi - > IsName ( ) ) { <nl> + msg < < Name : : cast ( name_or_sfi ) ; <nl> + } else if ( name_or_sfi - > IsSharedFunctionInfo ( ) ) { <nl> + SharedFunctionInfo * sfi = SharedFunctionInfo : : cast ( name_or_sfi ) ; <nl> + msg < < sfi - > DebugName ( ) ; <nl> + # if V8_SFI_HAS_UNIQUE_ID <nl> + msg < < " " < < sfi - > unique_id ( ) ; <nl> + # endif / / V8_SFI_HAS_UNIQUE_ID <nl> + } <nl> + } <nl> + msg . WriteToLogFile ( ) ; <nl> + } <nl> + <nl> + void Logger : : MapDetails ( Map * map ) { <nl> + if ( ! log_ - > IsEnabled ( ) | | ! FLAG_trace_maps ) return ; <nl> + DisallowHeapAllocation no_gc ; <nl> + Log : : MessageBuilder msg ( log_ ) ; <nl> + msg < < " map - details " < < kNext < < timer_ . Elapsed ( ) . InMicroseconds ( ) < < kNext <nl> + < < reinterpret_cast < void * > ( map ) < < kNext ; <nl> + std : : ostringstream buffer ; <nl> + map - > PrintMapDetails ( buffer ) ; <nl> + msg < < buffer . str ( ) . c_str ( ) ; <nl> + msg . WriteToLogFile ( ) ; <nl> + } <nl> + <nl> void Logger : : StopProfiler ( ) { <nl> if ( ! log_ - > IsEnabled ( ) ) return ; <nl> if ( profiler_ ! = nullptr ) { <nl> mmm a / src / log . h <nl> ppp b / src / log . h <nl> class Logger : public CodeEventListener { <nl> char old_state , char new_state , const char * modifier , <nl> const char * slow_stub_reason ) ; <nl> <nl> + void LogAllTransitions ( Map * map ) ; <nl> + void MapEvent ( const char * type , Map * from , Map * to , <nl> + const char * reason = nullptr , <nl> + HeapObject * name_or_sfi = nullptr ) ; <nl> + void MapDetails ( Map * map ) ; <nl> + <nl> / / = = = = Events logged by - - log - gc . = = = = <nl> / / Heap sampling events : start , end , and individual types . <nl> void HeapSampleBeginEvent ( const char * space , const char * kind ) ; <nl> mmm a / src / objects - inl . h <nl> ppp b / src / objects - inl . h <nl> bool Map : : is_callable ( ) const { <nl> <nl> void Map : : deprecate ( ) { <nl> set_bit_field3 ( Deprecated : : update ( bit_field3 ( ) , true ) ) ; <nl> + if ( FLAG_trace_maps ) { <nl> + LOG ( GetIsolate ( ) , MapEvent ( " Deprecate " , this , nullptr ) ) ; <nl> + } <nl> } <nl> <nl> bool Map : : is_deprecated ( ) const { return Deprecated : : decode ( bit_field3 ( ) ) ; } <nl> mmm a / src / objects - printer . cc <nl> ppp b / src / objects - printer . cc <nl> int Name : : NameShortPrint ( Vector < char > str ) { <nl> } <nl> } <nl> <nl> - # if defined ( DEBUG ) | | defined ( OBJECT_PRINT ) <nl> - / / This method is only meant to be called from gdb for debugging purposes . <nl> - / / Since the string can also be in two - byte encoding , non - Latin1 characters <nl> - / / will be ignored in the output . <nl> - char * String : : ToAsciiArray ( ) { <nl> - / / Static so that subsequent calls frees previously allocated space . <nl> - / / This also means that previous results will be overwritten . <nl> - static char * buffer = nullptr ; <nl> - if ( buffer ! = nullptr ) delete [ ] buffer ; <nl> - buffer = new char [ length ( ) + 1 ] ; <nl> - WriteToFlat ( this , reinterpret_cast < uint8_t * > ( buffer ) , 0 , length ( ) ) ; <nl> - buffer [ length ( ) ] = 0 ; <nl> - return buffer ; <nl> - } <nl> - <nl> - <nl> - void DescriptorArray : : Print ( ) { <nl> - OFStream os ( stdout ) ; <nl> - this - > PrintDescriptors ( os ) ; <nl> - os < < std : : flush ; <nl> + void Map : : PrintMapDetails ( std : : ostream & os , JSObject * holder ) { <nl> + DisallowHeapAllocation no_gc ; <nl> + # ifdef OBJECT_PRINT <nl> + this - > MapPrint ( os ) ; <nl> + # else <nl> + os < < " Map = " < < reinterpret_cast < void * > ( this ) ; <nl> + # endif <nl> + os < < " \ n " ; <nl> + instance_descriptors ( ) - > PrintDescriptors ( os ) ; <nl> + if ( is_dictionary_map ( ) & & holder ! = nullptr ) { <nl> + os < < holder - > property_dictionary ( ) < < " \ n " ; <nl> + } <nl> } <nl> <nl> - <nl> void DescriptorArray : : PrintDescriptors ( std : : ostream & os ) { / / NOLINT <nl> HandleScope scope ( GetIsolate ( ) ) ; <nl> os < < " Descriptor array # " < < number_of_descriptors ( ) < < " : " ; <nl> void DescriptorArray : : PrintDescriptorDetails ( std : : ostream & os , int descriptor , <nl> } <nl> } <nl> <nl> + # if defined ( DEBUG ) | | defined ( OBJECT_PRINT ) <nl> + / / This method is only meant to be called from gdb for debugging purposes . <nl> + / / Since the string can also be in two - byte encoding , non - Latin1 characters <nl> + / / will be ignored in the output . <nl> + char * String : : ToAsciiArray ( ) { <nl> + / / Static so that subsequent calls frees previously allocated space . <nl> + / / This also means that previous results will be overwritten . <nl> + static char * buffer = nullptr ; <nl> + if ( buffer ! = nullptr ) delete [ ] buffer ; <nl> + buffer = new char [ length ( ) + 1 ] ; <nl> + WriteToFlat ( this , reinterpret_cast < uint8_t * > ( buffer ) , 0 , length ( ) ) ; <nl> + buffer [ length ( ) ] = 0 ; <nl> + return buffer ; <nl> + } <nl> + <nl> + void DescriptorArray : : Print ( ) { <nl> + OFStream os ( stdout ) ; <nl> + this - > PrintDescriptors ( os ) ; <nl> + os < < std : : flush ; <nl> + } <nl> / / static <nl> void TransitionsAccessor : : PrintOneTransition ( std : : ostream & os , Name * key , <nl> Map * target , Object * raw_target ) { <nl> mmm a / src / objects . cc <nl> ppp b / src / objects . cc <nl> void JSObject : : MigrateSlowToFast ( Handle < JSObject > object , <nl> NotifyMapChange ( old_map , new_map , isolate ) ; <nl> <nl> if ( FLAG_trace_maps ) { <nl> - PrintF ( " [ TraceMaps : SlowToFast from = % p to = % p reason = % s ] \ n " , <nl> - reinterpret_cast < void * > ( * old_map ) , reinterpret_cast < void * > ( * new_map ) , <nl> - reason ) ; <nl> + LOG ( isolate , MapEvent ( " SlowToFast " , * old_map , * new_map , reason ) ) ; <nl> } <nl> <nl> if ( instance_descriptor_length = = 0 ) { <nl> Handle < Map > Map : : Normalize ( Handle < Map > fast_map , PropertyNormalizationMode mode , <nl> isolate - > counters ( ) - > maps_normalized ( ) - > Increment ( ) ; <nl> } <nl> if ( FLAG_trace_maps ) { <nl> - PrintF ( " [ TraceMaps : Normalize from = % p to = % p reason = % s ] \ n " , <nl> - reinterpret_cast < void * > ( * fast_map ) , <nl> - reinterpret_cast < void * > ( * new_map ) , reason ) ; <nl> + LOG ( isolate , MapEvent ( " Normalize " , * fast_map , * new_map , reason ) ) ; <nl> } <nl> } <nl> fast_map - > NotifyLeafMapLayoutChange ( ) ; <nl> Handle < Map > Map : : ShareDescriptor ( Handle < Map > map , <nl> return result ; <nl> } <nl> <nl> - / / static <nl> - void Map : : TraceTransition ( const char * what , Map * from , Map * to , Name * name ) { <nl> - if ( FLAG_trace_maps ) { <nl> - PrintF ( " [ TraceMaps : % s from = % p to = % p name = " , what , <nl> - reinterpret_cast < void * > ( from ) , reinterpret_cast < void * > ( to ) ) ; <nl> - name - > NameShortPrint ( ) ; <nl> - PrintF ( " ] \ n " ) ; <nl> - } <nl> - } <nl> - <nl> - <nl> - / / static <nl> - void Map : : TraceAllTransitions ( Map * map ) { <nl> - DisallowHeapAllocation no_gc ; <nl> - TransitionsAccessor transitions ( map , & no_gc ) ; <nl> - int num_transitions = transitions . NumberOfTransitions ( ) ; <nl> - for ( int i = - 0 ; i < num_transitions ; + + i ) { <nl> - Map * target = transitions . GetTarget ( i ) ; <nl> - Name * key = transitions . GetKey ( i ) ; <nl> - Map : : TraceTransition ( " Transition " , map , target , key ) ; <nl> - Map : : TraceAllTransitions ( target ) ; <nl> - } <nl> - } <nl> - <nl> void Map : : ConnectTransition ( Handle < Map > parent , Handle < Map > child , <nl> Handle < Name > name , SimpleTransitionFlag flag ) { <nl> Isolate * isolate = parent - > GetIsolate ( ) ; <nl> void Map : : ConnectTransition ( Handle < Map > parent , Handle < Map > child , <nl> } <nl> if ( parent - > is_prototype_map ( ) ) { <nl> DCHECK ( child - > is_prototype_map ( ) ) ; <nl> - Map : : TraceTransition ( " NoTransition " , * parent , * child , * name ) ; <nl> + if ( FLAG_trace_maps ) { <nl> + LOG ( isolate , MapEvent ( " Transition " , * parent , * child , " prototype " , * name ) ) ; <nl> + } <nl> } else { <nl> TransitionsAccessor ( parent ) . Insert ( name , child , flag ) ; <nl> - Map : : TraceTransition ( " Transition " , * parent , * child , * name ) ; <nl> + if ( FLAG_trace_maps ) { <nl> + LOG ( isolate , MapEvent ( " Transition " , * parent , * child , " " , * name ) ) ; <nl> + } <nl> } <nl> } <nl> <nl> Handle < Map > Map : : CopyReplaceDescriptors ( <nl> ( map - > is_prototype_map ( ) | | <nl> ! ( flag = = INSERT_TRANSITION & & <nl> TransitionsAccessor ( map ) . CanHaveMoreTransitions ( ) ) ) ) { <nl> - PrintF ( " [ TraceMaps : ReplaceDescriptors from = % p to = % p reason = % s ] \ n " , <nl> - reinterpret_cast < void * > ( * map ) , reinterpret_cast < void * > ( * result ) , <nl> - reason ) ; <nl> + LOG ( map - > GetIsolate ( ) , MapEvent ( " ReplaceDescriptors " , * map , * result , reason , <nl> + maybe_name . is_null ( ) ? nullptr : * name ) ) ; <nl> } <nl> return result ; <nl> } <nl> Handle < Map > Map : : CopyForTransition ( Handle < Map > map , const char * reason ) { <nl> } <nl> <nl> if ( FLAG_trace_maps ) { <nl> - PrintF ( " [ TraceMaps : CopyForTransition from = % p to = % p reason = % s ] \ n " , <nl> - reinterpret_cast < void * > ( * map ) , reinterpret_cast < void * > ( * new_map ) , <nl> - reason ) ; <nl> + LOG ( map - > GetIsolate ( ) , <nl> + MapEvent ( " CopyForTransition " , * map , * new_map , reason ) ) ; <nl> } <nl> - <nl> return new_map ; <nl> } <nl> <nl> void JSFunction : : SetInitialMap ( Handle < JSFunction > function , Handle < Map > map , <nl> function - > set_prototype_or_initial_map ( * map ) ; <nl> map - > SetConstructor ( * function ) ; <nl> if ( FLAG_trace_maps ) { <nl> - int sfi_id = - 1 ; <nl> - # if V8_SFI_HAS_UNIQUE_ID <nl> - sfi_id = function - > shared ( ) - > unique_id ( ) ; <nl> - # endif / / V8_SFI_HAS_UNIQUE_ID <nl> - PrintF ( " [ TraceMaps : InitialMap map = % p SFI = % d_ % s ] \ n " , <nl> - reinterpret_cast < void * > ( * map ) , sfi_id , <nl> - function - > shared ( ) - > DebugName ( ) - > ToCString ( ) . get ( ) ) ; <nl> + LOG ( map - > GetIsolate ( ) , MapEvent ( " InitialMap " , nullptr , * map , " " , <nl> + function - > shared ( ) - > DebugName ( ) ) ) ; <nl> } <nl> } <nl> <nl> mmm a / src / objects / descriptor - array . h <nl> ppp b / src / objects / descriptor - array . h <nl> class DescriptorArray : public FixedArray { <nl> static const int kEntryValueIndex = 2 ; <nl> static const int kEntrySize = 3 ; <nl> <nl> - # if defined ( DEBUG ) | | defined ( OBJECT_PRINT ) <nl> - / / For our gdb macros , we should perhaps change these in the future . <nl> - void Print ( ) ; <nl> - <nl> / / Print all the descriptors . <nl> void PrintDescriptors ( std : : ostream & os ) ; / / NOLINT <nl> - <nl> void PrintDescriptorDetails ( std : : ostream & os , int descriptor , <nl> PropertyDetails : : PrintMode mode ) ; <nl> + <nl> + # if defined ( DEBUG ) | | defined ( OBJECT_PRINT ) <nl> + / / For our gdb macros , we should perhaps change these in the future . <nl> + void Print ( ) ; <nl> # endif <nl> <nl> # ifdef DEBUG <nl> mmm a / src / objects / map . h <nl> ppp b / src / objects / map . h <nl> class Map : public HeapObject { <nl> / / Returns true if given field is unboxed double . <nl> inline bool IsUnboxedDoubleField ( FieldIndex index ) const ; <nl> <nl> - static void TraceTransition ( const char * what , Map * from , Map * to , Name * name ) ; <nl> - static void TraceAllTransitions ( Map * map ) ; <nl> + void PrintMapDetails ( std : : ostream & os , JSObject * holder = nullptr ) ; <nl> <nl> static inline Handle < Map > AddMissingTransitionsForTesting ( <nl> Handle < Map > split_map , Handle < DescriptorArray > descriptors , <nl> mmm a / test / cctest / test - log . cc <nl> ppp b / test / cctest / test - log . cc <nl> TEST ( LogAll ) { <nl> } <nl> isolate - > Dispose ( ) ; <nl> } <nl> + <nl> + TEST ( TraceMaps ) { <nl> + SETUP_FLAGS ( ) ; <nl> + i : : FLAG_trace_maps = true ; <nl> + v8 : : Isolate : : CreateParams create_params ; <nl> + create_params . array_buffer_allocator = CcTest : : array_buffer_allocator ( ) ; <nl> + v8 : : Isolate * isolate = v8 : : Isolate : : New ( create_params ) ; <nl> + { <nl> + ScopedLoggerInitializer logger ( saved_log , saved_prof , isolate ) ; <nl> + / / Try to create many different kind of maps to make sure the logging won ' t <nl> + / / crash . More detailed tests are implemented separately . <nl> + const char * source_text = <nl> + " let a = { } ; " <nl> + " for ( let i = 0 ; i < 500 ; i + + ) { a [ ' p ' + i ] = i } ; " <nl> + " class Test { constructor ( i ) { this . a = 1 ; this [ ' p ' + i ] = 1 ; } } ; " <nl> + " let t = new Test ( ) ; " <nl> + " t . b = 1 ; t . c = 1 ; t . d = 3 ; " <nl> + " for ( let i = 0 ; i < 100 ; i + + ) { t = new Test ( i ) } ; " <nl> + " t . b = { } ; " ; <nl> + CompileRun ( source_text ) ; <nl> + <nl> + logger . StopLogging ( ) ; <nl> + <nl> + / / Mostly superficial checks . <nl> + CHECK ( logger . FindLine ( " map , InitialMap " , " , 0x " ) ) ; <nl> + CHECK ( logger . FindLine ( " map , Transition " , " , 0x " ) ) ; <nl> + CHECK ( logger . FindLine ( " map - details " , " , 0x " ) ) ; <nl> + } <nl> + i : : FLAG_trace_maps = false ; <nl> + isolate - > Dispose ( ) ; <nl> + } <nl>
|
[ log ] Use log for - - trace - maps
|
v8/v8
|
c3ad1e90678b7a940ba639350d77c494850ed7c5
|
2017-10-27T03:33:49Z
|
mmm a / db / geo / 2d . cpp <nl> ppp b / db / geo / 2d . cpp <nl> namespace mongo { <nl> <nl> int _configval ( const IndexSpec * spec , const string & name , int def ) { <nl> BSONElement e = spec - > info [ name ] ; <nl> - if ( e . isNumber ( ) ) <nl> - return e . numberInt ( ) ; <nl> + if ( e . isNumber ( ) ) { <nl> + / / Check that our values are not too big or small <nl> + uassert_msg ( 15073 , " Value " < < e . numberLong ( ) < < " exceeds integer bounds . " , e . numberLong ( ) = = e . numberInt ( ) ) <nl> + return e . numberInt ( ) ; <nl> + } <nl> return def ; <nl> } <nl> <nl> mmm a / db / pdfile . cpp <nl> ppp b / db / pdfile . cpp <nl> namespace mongo { <nl> assert ( d - > indexBuildInProgress = = 0 ) ; <nl> assertInWriteLock ( ) ; <nl> RecoverableIndexState recoverable ( d ) ; <nl> + <nl> + / / Build index spec here in case the collection is empty and the index details are invalid <nl> + idx . getSpec ( ) ; <nl> + <nl> if ( inDBRepair | | ! background ) { <nl> n = fastBuildIndex ( ns . c_str ( ) , d , idx , idxNo ) ; <nl> assert ( ! idx . head . isNull ( ) ) ; <nl> mmm a / jstests / geo10 . js <nl> ppp b / jstests / geo10 . js <nl> <nl> coll = db . geo10 <nl> coll . drop ( ) ; <nl> <nl> - db . geo10 . ensureIndex ( { c : ' 2d ' , t : 1 } , { min : 0 , max : Math . pow ( 2 , 31 ) } ) <nl> - print ( db . getLastError ( ) ) <nl> + db . geo10 . ensureIndex ( { c : ' 2d ' , t : 1 } , { min : 0 , max : Math . pow ( 2 , 31 ) } ) <nl> + assert ( db . getLastError ( ) , " A0 " ) <nl> + assert ( db . system . indexes . count ( ) = = 1 , " A1 " ) <nl> <nl> - print ( Math . pow ( 2 , 30 ) ) <nl> + db . geo10 . ensureIndex ( { c : ' 2d ' , t : 1 } , { min : 0 , max : Math . pow ( 2 , 30 ) } ) <nl> + assert ( db . getLastError ( ) = = null , " B " ) <nl> + assert ( db . system . indexes . count ( ) = = 2 , " A3 " ) <nl> <nl> - db . geo10 . insert ( { c : [ 1 , 1 ] , t : 1 } ) <nl> - print ( db . getLastError ( ) ) <nl> - <nl> - db . geo10 . insert ( { c : [ 3600 , 3600 ] , t : 1 } ) <nl> - print ( db . getLastError ( ) ) <nl> + printjson ( db . system . indexes . find ( ) . toArray ( ) ) <nl> <nl> - db . geo10 . insert ( { c : [ 0 . 001 , 0 . 001 ] , t : 1 } ) <nl> - print ( db . getLastError ( ) ) <nl> + db . geo10 . insert ( { c : [ 1 , 1 ] , t : 1 } ) <nl> + assert ( db . getLastError ( ) = = null , " C " ) <nl> <nl> - printjson ( db . system . indexes . find ( ) . toArray ( ) ) <nl> + db . geo10 . insert ( { c : [ 3600 , 3600 ] , t : 1 } ) <nl> + assert ( db . getLastError ( ) = = null , " D " ) <nl> <nl> + db . geo10 . insert ( { c : [ 0 . 001 , 0 . 001 ] , t : 1 } ) <nl> + assert ( db . getLastError ( ) = = null , " E " ) <nl> <nl>
|
Changes for SERVER - 2746
|
mongodb/mongo
|
f027a8dbc746412ea4b45a3a6563d4f591059b06
|
2011-03-14T16:50:44Z
|
mmm a / hphp / runtime / vm / jit / code - gen - x64 . cpp <nl> ppp b / hphp / runtime / vm / jit / code - gen - x64 . cpp <nl> void CodeGenerator : : cgLookupClsMethodCache ( IRInstruction * inst ) { <nl> const UNUSED Func * f = StaticMethodCache : : lookup ( <nl> ch , ne , cls , method , fake_fp ) ; <nl> } <nl> - always_assert ( srcLoc ( 0 ) . reg ( ) = = rbp ) ; <nl> - always_assert ( ! inst - > src ( 0 ) - > isConst ( ) ) ; <nl> + if ( inst - > src ( 0 ) - > isConst ( ) ) { <nl> + PUNT ( LookupClsMethodCache_const_fp ) ; <nl> + } <nl> <nl> / / can raise an error if class is undefined <nl> cgCallHelper ( m_as , <nl> void CodeGenerator : : cgInterpOneCommon ( IRInstruction * inst ) { <nl> void * interpOneHelper = interpOneEntryPoints [ opc ] ; <nl> <nl> auto dstReg = InvalidReg ; <nl> - always_assert ( ! inst - > src ( 1 ) - > isConst ( ) ) ; <nl> + if ( inst - > src ( 1 ) - > isConst ( ) ) { <nl> + PUNT ( InterpOneCommon_const_fp ) ; <nl> + } <nl> cgCallHelper ( m_as , <nl> CppCall : : direct ( reinterpret_cast < void ( * ) ( ) > ( interpOneHelper ) ) , <nl> callDest ( dstReg ) , <nl>
|
Punt if framep is constant
|
facebook/hhvm
|
3f4dd273473a65a8ece6c71acf569788a005afc5
|
2014-06-05T21:17:24Z
|
mmm a / src / video_core / debug_utils / debug_utils . cpp <nl> ppp b / src / video_core / debug_utils / debug_utils . cpp <nl> const Math : : Vec4 < u8 > LookupTexture ( const u8 * source , int x , int y , const Texture <nl> / / Interleave the lower 3 bits of each coordinate to get the intra - block offsets , which are <nl> / / arranged in a Z - order curve . More details on the bit manipulation at : <nl> / / https : / / fgiesen . wordpress . com / 2009 / 12 / 13 / decoding - morton - codes / <nl> - unsigned int i = ( x | ( y < < 8 ) ) & 0x0707 ; / / mmm - - 210 <nl> - i = ( i ^ ( i < < 2 ) ) & 0x1313 ; / / mmm2 - - 10 <nl> - i = ( i ^ ( i < < 1 ) ) & 0x1515 ; / / mmm2 - 1 - 0 <nl> + unsigned int i = ( x & 7 ) | ( ( y & 7 ) < < 8 ) ; / / mmm - - 210 <nl> + i = ( i ^ ( i < < 2 ) ) & 0x1313 ; / / mmm2 - - 10 <nl> + i = ( i ^ ( i < < 1 ) ) & 0x1515 ; / / mmm2 - 1 - 0 <nl> i = ( i | ( i > > 7 ) ) & 0x3F ; <nl> <nl> if ( info . format ! = Regs : : TextureFormat : : ETC1 & & <nl>
|
Merge pull request from yuriks / pixelated - textures
|
yuzu-emu/yuzu
|
3342679b33dc836ad1cb4ed39b53b0ed1eaaca1a
|
2015-02-26T01:18:29Z
|
mmm a / src / properties / trackerlist . cpp <nl> ppp b / src / properties / trackerlist . cpp <nl> void TrackerList : : loadStickyItems ( const QTorrentHandle & h ) { <nl> + + nb_pex ; <nl> } <nl> / / load DHT information <nl> - if ( QBtSession : : instance ( ) - > isDHTEnabled ( ) & & h . has_metadata ( ) & & ! h . priv ( ) ) { <nl> + if ( QBtSession : : instance ( ) - > isDHTEnabled ( ) & & ! h . priv ( ) ) { <nl> dht_item - > setText ( COL_STATUS , tr ( " Working " ) ) ; <nl> } else { <nl> dht_item - > setText ( COL_STATUS , tr ( " Disabled " ) ) ; <nl>
|
Fix DHT wrongly reported as disabled for magnet links ( closes )
|
qbittorrent/qBittorrent
|
179985954c3d9210cd31d6e8271846a185ebe858
|
2012-07-14T14:39:39Z
|
mmm a / src / objective - c / GRPCClient / GRPCCall . m <nl> ppp b / src / objective - c / GRPCClient / GRPCCall . m <nl> - ( void ) startCallWithWriteable : ( id < GRXWriteable > ) writeable { <nl> [ self sendHeaders : _requestHeaders ] ; <nl> [ self invokeCall ] ; <nl> <nl> - / / TODO ( jcanizales ) : Extract this logic somewhere common . <nl> - NSString * host = [ NSURL URLWithString : [ @ " https : / / " stringByAppendingString : _host ] ] . host ; <nl> - if ( ! host ) { <nl> - / / TODO ( jcanizales ) : Check this on init . <nl> - [ NSException raise : NSInvalidArgumentException format : @ " host of % @ is nil " , _host ] ; <nl> - } <nl> [ GRPCConnectivityMonitor registerObserver : self <nl> selector : @ selector ( connectivityChanged : ) ] ; <nl> } <nl>
|
Merge pull request from grpc / remove - hostname - extraction
|
grpc/grpc
|
30e1b4aa1fc7ee5efa6ce5bde04b174fda421cab
|
2018-03-09T07:48:30Z
|
mmm a / arangod / Agency / Supervision . cpp <nl> ppp b / arangod / Agency / Supervision . cpp <nl> using namespace arangodb ; <nl> <nl> using namespace arangodb : : consensus ; <nl> <nl> - std : : string printTimestamp ( Supervision : : TimePoint const & t ) { <nl> + std : : string timepointToString ( Supervision : : TimePoint const & t ) { <nl> time_t tt = std : : chrono : : system_clock : : to_time_t ( t ) ; <nl> struct tm tb ; <nl> size_t const len ( 21 ) ; <nl> char buffer [ len ] ; <nl> - TRI_gmtime ( tt , & tb ) ; <nl> + TRI_localtime ( tt , & tb ) ; <nl> : : strftime ( buffer , sizeof ( buffer ) , " % Y - % m - % dT % H : % M : % SZ " , & tb ) ; <nl> return std : : string ( buffer , len - 1 ) ; <nl> } <nl> <nl> + Supervision : : TimePoint stringToTimepoint ( std : : string const & str ) { <nl> + std : : tm tt ; <nl> + tt . tm_year = std : : stoi ( str . substr ( 0 , 4 ) ) - 1900 ; <nl> + tt . tm_mon = std : : stoi ( str . substr ( 5 , 2 ) ) - 1 ; <nl> + tt . tm_mday = std : : stoi ( str . substr ( 8 , 2 ) ) ; <nl> + tt . tm_hour = std : : stoi ( str . substr ( 11 , 2 ) ) ; <nl> + tt . tm_min = std : : stoi ( str . substr ( 14 , 2 ) ) ; <nl> + tt . tm_sec = std : : stoi ( str . substr ( 17 , 2 ) ) ; <nl> + tt . tm_isdst = - 1 ; <nl> + auto time_c = : : mktime ( & tt ) ; <nl> + return std : : chrono : : system_clock : : from_time_t ( time_c ) ; <nl> + } <nl> + <nl> + <nl> inline arangodb : : consensus : : write_ret_t transact ( <nl> Agent * _agent , Builder const & transaction ) { <nl> <nl> inline arangodb : : consensus : : write_ret_t transact ( <nl> LOG_TOPIC ( ERR , Logger : : AGENCY ) < < e . what ( ) ; <nl> } <nl> <nl> - LOG ( INFO ) < < envelope - > toJson ( ) ; <nl> + LOG_TOPIC ( DEBUG , Logger : : AGENCY ) < < envelope - > toJson ( ) ; <nl> return _agent - > write ( envelope ) ; <nl> <nl> } <nl> bool Job : : finish ( std : : string const & type , bool success = true ) const { <nl> finished . add ( _agencyPrefix + ( success ? finishedPrefix : failedPrefix ) <nl> + _jobId , VPackValue ( VPackValueType : : Object ) ) ; <nl> finished . add ( " timeFinished " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + VPackValue ( timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> for ( auto const & obj : VPackObjectIterator ( pending . slice ( ) [ 0 ] ) ) { <nl> finished . add ( obj . key . copyString ( ) , obj . value ) ; <nl> } <nl> bool Job : : finish ( std : : string const & type , bool success = true ) const { <nl> finished . close ( ) ; <nl> <nl> / / mmm Remove block <nl> - finished . add ( _agencyPrefix + " / Supervision / " + type + _jobId , <nl> + finished . add ( _agencyPrefix + " / Supervision / " + type , <nl> VPackValue ( VPackValueType : : Object ) ) ; <nl> finished . add ( " op " , VPackValue ( " delete " ) ) ; <nl> finished . close ( ) ; <nl> struct FailedLeader : public Job { <nl> todo . add ( " isLeader " , VPackValue ( true ) ) ; <nl> todo . add ( " jobId " , VPackValue ( _jobId ) ) ; <nl> todo . add ( " timeCreated " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + VPackValue ( timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> todo . close ( ) ; todo . close ( ) ; todo . close ( ) ; <nl> <nl> write_ret_t res = transact ( _agent , todo ) ; <nl> struct FailedLeader : public Job { <nl> pending . add ( _agencyPrefix + pendingPrefix + _jobId , <nl> VPackValue ( VPackValueType : : Object ) ) ; <nl> pending . add ( " timeStarted " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + VPackValue ( timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> for ( auto const & obj : VPackObjectIterator ( todo . slice ( ) [ 0 ] ) ) { <nl> pending . add ( obj . key . copyString ( ) , obj . value ) ; <nl> } <nl> struct FailedLeader : public Job { <nl> <nl> if ( planned . slice ( ) [ 0 ] = = current . slice ( ) [ 0 ] ) { <nl> <nl> - if ( finish ( " Shards / " + _shard + " / " ) ) { <nl> + if ( finish ( " Shards / " + shard ) ) { <nl> return FINISHED ; <nl> } <nl> <nl> struct FailedServer : public Job { <nl> pending . add ( _agencyPrefix + pendingPrefix + _jobId , <nl> VPackValue ( VPackValueType : : Object ) ) ; <nl> pending . add ( " timeStarted " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + VPackValue ( timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> for ( auto const & obj : VPackObjectIterator ( todo . slice ( ) [ 0 ] ) ) { <nl> pending . add ( obj . key . copyString ( ) , obj . value ) ; <nl> } <nl> struct FailedServer : public Job { <nl> todo . add ( " jobId " , VPackValue ( _jobId ) ) ; <nl> todo . add ( " creator " , VPackValue ( _creator ) ) ; <nl> todo . add ( " timeCreated " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + VPackValue ( timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> todo . close ( ) ; todo . close ( ) ; todo . close ( ) ; <nl> <nl> write_ret_t res = transact ( _agent , todo ) ; <nl> struct FailedServer : public Job { <nl> } <nl> <nl> if ( ! found ) { <nl> - if ( finish ( " DBServers / " + _failed + " / " ) ) { <nl> + if ( finish ( " DBServers / " + _failed ) ) { <nl> return FINISHED ; <nl> } <nl> } <nl> struct CleanOutServer : public Job { <nl> std : : string const & creator , std : : string const & prefix , <nl> std : : string const & server ) : <nl> Job ( snapshot , agent , jobId , creator , prefix ) , _server ( server ) { <nl> + <nl> } <nl> <nl> virtual ~ CleanOutServer ( ) { } <nl> struct CleanOutServer : public Job { <nl> } <nl> <nl> virtual bool create ( ) const { <nl> - <nl> - LOG_TOPIC ( INFO , Logger : : AGENCY ) < < " Todo : Clean out server " + _server ; <nl> - <nl> - std : : string path = _agencyPrefix + toDoPrefix + _jobId ; <nl> - <nl> - Builder todo ; <nl> - todo . openArray ( ) ; <nl> - todo . openObject ( ) ; <nl> - todo . add ( path , VPackValue ( VPackValueType : : Object ) ) ; <nl> - todo . add ( " type " , VPackValue ( " cleanOutServer " ) ) ; <nl> - todo . add ( " server " , VPackValue ( _server ) ) ; <nl> - todo . add ( " jobId " , VPackValue ( _jobId ) ) ; <nl> - todo . add ( " creator " , VPackValue ( _creator ) ) ; <nl> - todo . add ( " timeCreated " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> - todo . close ( ) ; todo . close ( ) ; todo . close ( ) ; <nl> - <nl> - write_ret_t res = transact ( _agent , todo ) ; <nl> - <nl> - if ( res . accepted & & res . indices . size ( ) = = 1 & & res . indices [ 0 ] ) { <nl> - return true ; <nl> - } <nl> - <nl> - LOG_TOPIC ( INFO , Logger : : AGENCY ) < < " Failed to insert job " + _jobId ; <nl> return false ; <nl> - <nl> - } ; <nl> + } <nl> <nl> virtual bool start ( ) const { <nl> <nl> struct CleanOutServer : public Job { <nl> pending . add ( _agencyPrefix + pendingPrefix + _jobId , <nl> VPackValue ( VPackValueType : : Object ) ) ; <nl> pending . add ( " timeStarted " , <nl> - VPackValue ( printTimestamp ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + VPackValue ( timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> for ( auto const & obj : VPackObjectIterator ( todo . slice ( ) [ 0 ] ) ) { <nl> pending . add ( obj . key . copyString ( ) , obj . value ) ; <nl> } <nl> void Supervision : : wakeUp ( ) { <nl> } <nl> <nl> static std : : string const syncPrefix = " / Sync / ServerStates / " ; <nl> - static std : : string const supervisionPrefix = " / Supervision / Health / " ; <nl> + static std : : string const healthPrefix = " / Supervision / Health / " ; <nl> static std : : string const planDBServersPrefix = " / Plan / DBServers " ; <nl> <nl> std : : vector < check_t > Supervision : : checkDBServers ( ) { <nl> std : : vector < check_t > Supervision : : checkDBServers ( ) { <nl> _snapshot ( planDBServersPrefix ) . children ( ) ; <nl> <nl> for ( auto const & machine : machinesPlanned ) { <nl> - ServerID const & serverID = machine . first ; <nl> - auto it = _vitalSigns . find ( serverID ) ; <nl> - std : : string lastHeartbeatTime = <nl> - _snapshot ( syncPrefix + serverID + " / time " ) . toJson ( ) ; <nl> - std : : string lastHeartbeatStatus = <nl> - _snapshot ( syncPrefix + serverID + " / status " ) . toJson ( ) ; <nl> - <nl> - if ( it ! = _vitalSigns . end ( ) ) { / / Existing server <nl> - <nl> - query_t report = std : : make_shared < Builder > ( ) ; <nl> - report - > openArray ( ) ; <nl> - report - > openArray ( ) ; <nl> - report - > openObject ( ) ; <nl> - report - > add ( _agencyPrefix + supervisionPrefix + serverID , <nl> - VPackValue ( VPackValueType : : Object ) ) ; <nl> - report - > add ( " LastHearbeatReceived " , <nl> - VPackValue ( printTimestamp ( it - > second - > myTimestamp ) ) ) ; <nl> - report - > add ( " LastHearbeatSent " , VPackValue ( it - > second - > serverTimestamp ) ) ; <nl> - report - > add ( " LastHearbeatStatus " , VPackValue ( lastHeartbeatStatus ) ) ; <nl> - <nl> - if ( it - > second - > serverTimestamp = = lastHeartbeatTime ) { <nl> - report - > add ( " Status " , VPackValue ( " DOWN " ) ) ; <nl> - std : : chrono : : seconds t { 0 } ; <nl> - t = std : : chrono : : duration_cast < std : : chrono : : seconds > ( <nl> - std : : chrono : : system_clock : : now ( ) - it - > second - > myTimestamp ) ; <nl> - if ( t . count ( ) > _gracePeriod ) { / / Failure <nl> - if ( it - > second - > maintenance ( ) = = " 0 " ) { <nl> - it - > second - > maintenance ( std : : to_string ( _jobId + + ) ) ; <nl> - } <nl> - FailedServer fsj ( _snapshot , _agent , it - > second - > maintenance ( ) , <nl> + <nl> + bool good = false ; <nl> + std : : string lastHeartbeatTime , lastHeartbeatStatus , lastHeartbeatAcked , <nl> + lastStatus , heartbeatTime , heartbeatStatus , serverID ; <nl> + <nl> + serverID = machine . first ; <nl> + heartbeatTime = _snapshot ( syncPrefix + serverID + " / time " ) . toJson ( ) ; <nl> + heartbeatStatus = _snapshot ( syncPrefix + serverID + " / status " ) . toJson ( ) ; <nl> + <nl> + try { / / Existing <nl> + lastHeartbeatTime = <nl> + _snapshot ( healthPrefix + serverID + " / LastHeartbeatSent " ) . toJson ( ) ; <nl> + lastHeartbeatStatus = <nl> + _snapshot ( healthPrefix + serverID + " / LastHeartbeatStatus " ) . toJson ( ) ; <nl> + lastHeartbeatAcked = <nl> + _snapshot ( healthPrefix + serverID + " / LastHeartbeatAcked " ) . toJson ( ) ; <nl> + lastStatus = _snapshot ( healthPrefix + serverID + " / Status " ) . toJson ( ) ; <nl> + if ( lastHeartbeatTime ! = heartbeatTime ) { / / Update <nl> + good = true ; <nl> + } <nl> + } catch ( . . . ) { / / New server <nl> + good = true ; <nl> + } <nl> + <nl> + query_t report = std : : make_shared < Builder > ( ) ; <nl> + report - > openArray ( ) ; <nl> + report - > openArray ( ) ; <nl> + report - > openObject ( ) ; <nl> + report - > add ( _agencyPrefix + healthPrefix + serverID , <nl> + VPackValue ( VPackValueType : : Object ) ) ; <nl> + report - > add ( " LastHeartbeatSent " , VPackValue ( heartbeatTime ) ) ; <nl> + report - > add ( " LastHeartbeatStatus " , VPackValue ( heartbeatStatus ) ) ; <nl> + <nl> + if ( good ) { <nl> + report - > add ( " LastHeartbeatAcked " , <nl> + VPackValue ( <nl> + timepointToString ( std : : chrono : : system_clock : : now ( ) ) ) ) ; <nl> + report - > add ( " Status " , VPackValue ( " UP " ) ) ; <nl> + } else { <nl> + std : : chrono : : seconds t { 0 } ; <nl> + t = std : : chrono : : duration_cast < std : : chrono : : seconds > ( <nl> + std : : chrono : : system_clock : : now ( ) - stringToTimepoint ( lastHeartbeatAcked ) ) ; <nl> + if ( t . count ( ) > _gracePeriod ) { / / Failure <nl> + if ( lastStatus = = " DOWN " ) { <nl> + report - > add ( " Status " , VPackValue ( " FAILED " ) ) ; <nl> + FailedServer fsj ( _snapshot , _agent , std : : to_string ( _jobId + + ) , <nl> " supervision " , _agencyPrefix , serverID ) ; <nl> } <nl> - <nl> } else { <nl> - report - > add ( " Status " , VPackValue ( " UP " ) ) ; <nl> - it - > second - > update ( lastHeartbeatStatus , lastHeartbeatTime ) ; <nl> + report - > add ( " Status " , VPackValue ( " DOWN " ) ) ; <nl> } <nl> - <nl> - report - > close ( ) ; <nl> - report - > close ( ) ; <nl> - report - > close ( ) ; <nl> - report - > close ( ) ; <nl> - _agent - > write ( report ) ; <nl> - <nl> - } else { / / New server <nl> - _vitalSigns [ serverID ] = <nl> - std : : make_shared < VitalSign > ( lastHeartbeatStatus , lastHeartbeatTime ) ; <nl> } <nl> - } <nl> <nl> - auto itr = _vitalSigns . begin ( ) ; <nl> - while ( itr ! = _vitalSigns . end ( ) ) { <nl> - if ( machinesPlanned . find ( itr - > first ) = = machinesPlanned . end ( ) ) { <nl> - itr = _vitalSigns . erase ( itr ) ; <nl> - } else { <nl> - + + itr ; <nl> - } <nl> + report - > close ( ) ; <nl> + report - > close ( ) ; <nl> + report - > close ( ) ; <nl> + report - > close ( ) ; <nl> + _agent - > write ( report ) ; <nl> + <nl> } <nl> <nl> return ret ; <nl> void Supervision : : run ( ) { <nl> <nl> / / Do supervision <nl> doChecks ( timedout ) ; <nl> - <nl> + workJobs ( ) ; <nl> <nl> <nl> } <nl> <nl> } <nl> <nl> + void Supervision : : workJobs ( ) { <nl> + <nl> + for ( auto const & todoEnt : _snapshot ( toDoPrefix ) . children ( ) ) { <nl> + Node const & todo = * todoEnt . second ; <nl> + if ( todo ( " type " ) . toJson ( ) = = " failedServer " ) { <nl> + FailedServer fs ( <nl> + _snapshot , _agent , todo ( " jobId " ) . toJson ( ) , todo ( " creator " ) . toJson ( ) , <nl> + _agencyPrefix , todo ( " server " ) . toJson ( ) ) ; <nl> + } <nl> + } <nl> + <nl> + for ( auto const & todoEnt : _snapshot ( pendingPrefix ) . children ( ) ) { <nl> + Node const & todo = * todoEnt . second ; <nl> + if ( todo ( " type " ) . toJson ( ) = = " failedServer " ) { <nl> + FailedServer fs ( <nl> + _snapshot , _agent , todo ( " jobId " ) . toJson ( ) , todo ( " creator " ) . toJson ( ) , <nl> + _agencyPrefix , todo ( " server " ) . toJson ( ) ) ; <nl> + } <nl> + } <nl> + <nl> + } <nl> + <nl> / / Start thread <nl> bool Supervision : : start ( ) { <nl> Thread : : start ( ) ; <nl> mmm a / arangod / Agency / Supervision . h <nl> ppp b / arangod / Agency / Supervision . h <nl> class Supervision : public arangodb : : Thread { <nl> std : : vector < check_t > checkDBServers ( ) ; <nl> std : : vector < check_t > checkShards ( ) ; <nl> <nl> + void workJobs ( ) ; <nl> + <nl> / / / @ brief Get unique ids from agency <nl> bool getUniqueIds ( ) ; <nl> <nl> class Supervision : public arangodb : : Thread { <nl> <nl> / / / @ brief last vital signs as reported through heartbeats to agency <nl> / / / <nl> - std : : map < ServerID , std : : shared_ptr < VitalSign > > _vitalSigns ; <nl> + / / std : : map < ServerID , std : : shared_ptr < VitalSign > > _vitalSigns ; <nl> <nl> long _frequency ; <nl> long _gracePeriod ; <nl>
|
leader fail seems good
|
arangodb/arangodb
|
bad7a6a35a0183933cd6c04c9c0f35ee5fe471ce
|
2016-05-31T13:21:42Z
|
mmm a / extensions / GUI / CCScrollView / CCScrollView . cpp <nl> ppp b / extensions / GUI / CCScrollView / CCScrollView . cpp <nl> void ScrollView : : updateInset ( ) <nl> * / <nl> void ScrollView : : addChild ( Node * child , int zOrder , int tag ) <nl> { <nl> - child - > ignoreAnchorPointForPosition ( false ) ; <nl> - child - > setAnchorPoint ( Point ( 0 . 0f , 0 . 0f ) ) ; <nl> if ( _container ! = child ) { <nl> _container - > addChild ( child , zOrder , tag ) ; <nl> } else { <nl>
|
do not change anchor point of child .
|
cocos2d/cocos2d-x
|
c6f9f0e4061ef3c0c05b86d19ce2a82cb5b02cd7
|
2013-10-22T03:30:53Z
|
mmm a / docs / index . rst <nl> ppp b / docs / index . rst <nl> <nl> The Taichi Programming Language <nl> - = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> <nl> . . toctree : : <nl> : caption : Overview <nl> The Taichi Programming Language <nl> utilities <nl> cpp_style <nl> internal <nl> + taichicon <nl> <nl> <nl> . . toctree : : <nl> new file mode 100644 <nl> index 00000000000 . . 48c0f2cb7e9 <nl> mmm / dev / null <nl> ppp b / docs / taichicon . rst <nl> <nl> + TaichiCon <nl> + = = = = = = = = = <nl> + <nl> + We are hosting a series of online * * TaichiCon * * events for developers to gather and share their Taichi experiences . <nl> + <nl> + Past Conferences <nl> + mmmmmmmmmmmmmmm - <nl> + <nl> + Everything on previous TaichiCons is available in the ` TaichiCon < https : / / github . com / taichi - dev / taichicon > ` _ repository . <nl> + <nl> + Format <nl> + mmmmmm <nl> + <nl> + Each TaichiCon consists of two parts : * * talks * * and * * free discussions * * . <nl> + <nl> + - The first 1 - hour consists of four 10 - minute talks , each with 5 - minute Q & A ; <nl> + <nl> + - After the formal talks , attendees are free to chat about Taichi in any aspects . <nl> + <nl> + The conference format may evolve in the future . <nl> + <nl> + Language <nl> + mmmmmm - - <nl> + <nl> + The ` ` i ` ` - th TaichiCon will be hosted in <nl> + <nl> + - English ` ` ( if i % 2 = = 1 ) ` ` ; <nl> + - Chinese ( Mandarin ) ` ` ( if i % 2 = = 0 ) ` ` . <nl> + <nl> + Time and frequency <nl> + mmmmmmmmmmmmmmmmmm <nl> + <nl> + Taichi developers are scattered around the world , <nl> + so it ' s important to pick a good time so that people in different time zones can attend . <nl> + <nl> + A good time for people in Asia and the U . S . : <nl> + <nl> + - ( China , Beijing ) Sunday 10 : 00 - 11 : 00 <nl> + - ( Japan , Tokyo ) Sunday 11 : 00 - 12 : 00 <nl> + - ( New Zealand , Wellington ) Sunday 14 : 00 - 15 : 00 <nl> + - ( U . S . , East coast ) Saturday 22 : 00 - 23 : 00 <nl> + - ( U . S . , West coast ) Saturday 19 : 00 - 20 : 00 <nl> + <nl> + For people in Europe , we may need to find a better time . There is probably no perfect solution , <nl> + so it may make sense to pick different times for TaichiCons to provide equal opportunities to people around the world . <nl> + <nl> + TaichiCon will be hosted roughly once per month . <nl> + <nl> + Attending TaichiCon <nl> + mmmmmmmmmmmmmmmmmm - <nl> + <nl> + Everyone interested in Taichi or related topics <nl> + ( computer graphics , compilers , high - performance computing , computational fluid dynamics , etc . ) is welcome to participate ! <nl> + <nl> + The Zoom meeting room has a capacity of 300 participants . A few tips : <nl> + <nl> + - It ' s recommended to change your Zoom display name to a uniform ` ` name ( company ) ` ` format . For example , ` ` Yuanming Hu ( MIT CSAIL ) ` ` ; <nl> + - Please keep muted during the talks to avoid background noises ; <nl> + - If you have questions , feel free to raise them in the chat window ; <nl> + - Video recordings and slides will be uploaded after the conference ; <nl> + - Usually people do not open their cameras during TaichiCon to save network bandwidth for people in unsatisfactory network conditions . <nl> + <nl> + <nl> + Preparing for a talk at TaichiCon <nl> + mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + <nl> + We welcome any topics about Taichi , including but not limited to <nl> + <nl> + - API proposals ( e . g . , " I think the ` ` Matrix ` ` class needs to be refactored . Here are my thoughts . . . " ) <nl> + - Applications ( e . g . , " I wrote a new fluid solver using Taichi and would like to share . . . " ) <nl> + - Integrations ( e . g . , " Here ' s how I integrated Taichi into Blender . . . " ) <nl> + - Internal designs ( e . g . , " How a new backend is implemented " ) <nl> + - . . . <nl> + <nl> + The body of a TaichiCon talk should be 10 min . <nl> + After each talk , there are 5 minutes for Q & A . <nl> + The host may stop the talk if a speaker ' s talk lasts beyond 15 minutes . <nl> + <nl> + <nl> + Organizing TaichiCon <nl> + mmmmmmmmmmmmmmmmmm - - <nl> + <nl> + Before the conference : <nl> + <nl> + - Pick a nice time for the event ; <nl> + - Invite speakers : ask for a talk * * title * * , * * abstract * * , and a brief * * speaker introduction * * ; <nl> + - Advertise the event on social networks ( Facebook , Twitter , Zhihu etc . ) ; <nl> + - Make sure all speakers are already in the ( virtual ) conference room 10 minutes before the conference begins ; <nl> + <nl> + - If a speaker does not show up , try to remind him to attend via email . <nl> + <nl> + Hosting the conference : <nl> + <nl> + - Make sure the Zoom session is being recorded ; <nl> + - Remember to welcome everyone to attend : - ) <nl> + - Before each talk , introduce the speaker ; <nl> + - In the end , thank all the speakers and attendees . <nl> + <nl> + After the conference : <nl> + <nl> + - Upload the video to Youtube and Bilibili ; <nl> + - Collect speakers ' slides in PDF format ; <nl> + <nl> + - Make a representative image with screenshots of the first slides of all the talks ; <nl> + <nl> + <nl> + - Update the ` TaichiCon < https : / / github . com / taichi - dev / taichicon > ` _ repository following the format of TaichiCon 0 . <nl> + - Update this documentation page if you find any opportunities to improve the workflow of TaichiCon . <nl>
|
[ doc ] Document TaichiCon ( )
|
taichi-dev/taichi
|
afbb44c04c983b012ccc525423252b0a5bdfc333
|
2020-05-29T14:11:58Z
|
mmm a / tensorflow / compiler / xla / metric_table_report . cc <nl> ppp b / tensorflow / compiler / xla / metric_table_report . cc <nl> void MetricTableReport : : AppendTableRow ( const string & text , const double metric , <nl> const int64 max_metric_string_size = <nl> MetricString ( expected_metric_sum_ ) . size ( ) ; <nl> string metric_string = MetricString ( metric ) ; <nl> - string padding ( max_metric_string_size - metric_string . size ( ) + 1 , ' ' ) ; <nl> + <nl> + / / Don ' t try to make a gigantic string and crash if expected_metric_sum_ is <nl> + / / wrong somehow . <nl> + int64 padding_len = 1 ; <nl> + if ( max_metric_string_size > = metric_string . size ( ) ) { <nl> + padding_len + = max_metric_string_size - metric_string . size ( ) ; <nl> + } <nl> + string padding ( padding_len , ' ' ) ; <nl> AppendLine ( padding , metric_string , " ( " , MetricPercent ( metric ) , " Σ " , <nl> MetricPercent ( running_metric_sum ) , " ) " , text ) ; <nl> } <nl>
|
Don ' t crash when displaying XLA metrics if they happen to be negative .
|
tensorflow/tensorflow
|
7fb52cd54cb4eef3566671af5e4d9fbb451e19d7
|
2017-06-08T18:40:53Z
|
mmm a / dbms / src / Functions / modulo . cpp <nl> ppp b / dbms / src / Functions / modulo . cpp <nl> struct ModuloByConstantImpl <nl> <nl> / / / Here we failed to make the SSE variant from libdivide give an advantage . <nl> size_t size = a . size ( ) ; <nl> - for ( size_t i = 0 ; i < size ; + + i ) <nl> - c [ i ] = a [ i ] - ( a [ i ] / divider ) * b ; / / / NOTE : perhaps , the division semantics with the remainder of negative numbers is not preserved . <nl> + <nl> + / / / strict aliasing optimization for char like arrays <nl> + auto * __restrict src = a . data ( ) ; <nl> + auto * __restrict dst = c . data ( ) ; <nl> + <nl> + if ( b & ( b - 1 ) ) <nl> + { <nl> + for ( size_t i = 0 ; i < size ; + + i ) <nl> + dst [ i ] = src [ i ] - ( src [ i ] / divider ) * b ; / / / NOTE : perhaps , the division semantics with the remainder of negative numbers is not preserved . <nl> + } <nl> + else <nl> + { <nl> + / / gcc libdivide doesn ' t work well for pow2 division <nl> + auto mask = b - 1 ; <nl> + for ( size_t i = 0 ; i < size ; + + i ) <nl> + dst [ i ] = src [ i ] & mask ; <nl> + } <nl> } <nl> } ; <nl> <nl> new file mode 100644 <nl> index 00000000000 . . 931b160ea00 <nl> mmm / dev / null <nl> ppp b / dbms / tests / performance / modulo . xml <nl> <nl> + < test > <nl> + < type > loop < / type > <nl> + <nl> + < stop_conditions > <nl> + < any_of > <nl> + < iterations > 10 < / iterations > <nl> + < / any_of > <nl> + < / stop_conditions > <nl> + <nl> + < main_metric > <nl> + < min_time / > <nl> + < / main_metric > <nl> + <nl> + < query > SELECT number % 128 FROM numbers ( 300000000 ) FORMAT Null < / query > <nl> + < query > SELECT number % 255 FROM numbers ( 300000000 ) FORMAT Null < / query > <nl> + < query > SELECT number % 256 FROM numbers ( 300000000 ) FORMAT Null < / query > <nl> + < / test > <nl>
|
Merge pull request from amosbird / moduleopt
|
ClickHouse/ClickHouse
|
b598ae1e3e65c98b98e9aaa14914e1c6ca364c62
|
2019-11-17T20:25:49Z
|
mmm a / package . xml <nl> ppp b / package . xml <nl> <nl> < email > shenzhe163 @ gmail . com < / email > <nl> < active > yes < / active > <nl> < / developer > <nl> - < date > 2017 - 08 - 29 < / date > <nl> + < date > 2017 - 09 - 26 < / date > <nl> < time > 09 : 50 : 10 < / time > <nl> < version > <nl> - < release > 1 . 9 . 20 < / release > <nl> + < release > 1 . 9 . 21 < / release > <nl> < api > 1 . 9 < / api > <nl> < / version > <nl> < stability > <nl> <nl> < / stability > <nl> < license uri = " http : / / www . apache . org / licenses / LICENSE - 2 . 0 . html " > Apache2 . 0 < / license > <nl> < notes > <nl> - - Fixed 32 - bit system compilation failed <nl> - - Fixed not available on PHP5 <nl> + - Added Atomic \ long , support 64 - bit signed long integer <nl> + - Optimized the underlying GlobalMemory implementation , support the creation of an unlimited number of atoms , locks , tables <nl> + - Prohibit serialization of Swoole module object <nl> + - Fixed Http \ Client download method fourth argument is invalid <nl> + - Fixed FreeBSD platform compiler error report <nl> + - Fixed sendfile on the MacOS platform there is a 5 second delay problem <nl> + - Added Process : : setTimeout <nl> < / notes > <nl> < contents > <nl> < dir name = " / " > <nl> <nl> < file name = " swoole_client_async / connect_refuse . phpt " role = " test " / > <nl> < file name = " swoole_client_async / connect_timeout . phpt " role = " test " / > <nl> < file name = " swoole_client_async / connect_twice . phpt " role = " test " / > <nl> + < file name = " swoole_client_async / eof . phpt " role = " test " / > <nl> < file name = " swoole_client_async / getSocket_bug . phpt " role = " test " / > <nl> < file name = " swoole_client_async / getpeername . phpt " role = " test " / > <nl> < file name = " swoole_client_async / getsockname . phpt " role = " test " / > <nl> + < file name = " swoole_client_async / length_protocol . phpt " role = " test " / > <nl> < file name = " swoole_client_async / sendfile . phpt " role = " test " / > <nl> < file name = " swoole_client_async / sleep_wake . phpt " role = " test " / > <nl> < file name = " swoole_client_async / swoole_client . phpt " role = " test " / > <nl> < file name = " swoole_client_sync / eof . phpt " role = " test " / > <nl> + < file name = " swoole_client_sync / length_protocol . phpt " role = " test " / > <nl> < file name = " swoole_client_sync / sendfile . phpt " role = " test " / > <nl> < file name = " swoole_client_sync / swoole_client_connect1 - 1 . phpt " role = " test " / > <nl> < file name = " swoole_client_sync / swoole_client_connect1 - 2 . phpt " role = " test " / > <nl> <nl> < file name = " swoole_function / swoole_get_local_ip . phpt " role = " test " / > <nl> < file name = " swoole_function / swoole_set_process_name . phpt " role = " test " / > <nl> < file name = " swoole_function / swoole_version . phpt " role = " test " / > <nl> + < file name = " swoole_http2_client / get . phpt " role = " test " / > <nl> < file name = " swoole_http_client / connect_host_not_found . phpt " role = " test " / > <nl> < file name = " swoole_http_client / connect_port_not_listen . phpt " role = " test " / > <nl> < file name = " swoole_http_client / content_length . phpt " role = " test " / > <nl> <nl> < file name = " swoole_process / swoole_process_useQueue . phpt " role = " test " / > <nl> < file name = " swoole_process / swoole_process_wait . phpt " role = " test " / > <nl> < file name = " swoole_process / swoole_process_write . phpt " role = " test " / > <nl> + < file name = " swoole_process / timeout . phpt " role = " test " / > <nl> < file name = " swoole_redis / connect_refuse . phpt " role = " test " / > <nl> < file name = " swoole_redis / connect_timeout . phpt " role = " test " / > <nl> < file name = " swoole_redis / get_set . phpt " role = " test " / > <nl> <nl> < file name = " swoole_server / length_protocol . phpt " role = " test " / > <nl> < file name = " swoole_server / listen_fail . phpt " role = " test " / > <nl> < file name = " swoole_server / max_request . phpt " role = " test " / > <nl> + < file name = " swoole_server / pid_file . phpt " role = " test " / > <nl> < file name = " swoole_server / protect . phpt " role = " test " / > <nl> < file name = " swoole_server / protect_false . phpt " role = " test " / > <nl> < file name = " swoole_server / reload . phpt " role = " test " / > <nl> <nl> < file name = " swoole_server / task . phpt " role = " test " / > <nl> < file name = " swoole_server / taskWaitMulti . phpt " role = " test " / > <nl> < file name = " swoole_server / task_callback . phpt " role = " test " / > <nl> + < file name = " swoole_server / task_max_request . phpt " role = " test " / > <nl> < file name = " swoole_server / taskwait . phpt " role = " test " / > <nl> < file name = " swoole_server / unsock_dgram . phpt " role = " test " / > <nl> < file name = " swoole_server / unsock_stream . phpt " role = " test " / > <nl> mmm a / php_swoole . h <nl> ppp b / php_swoole . h <nl> <nl> # include " Client . h " <nl> # include " async . h " <nl> <nl> - # define PHP_SWOOLE_VERSION " 1 . 9 . 20 " <nl> + # define PHP_SWOOLE_VERSION " 1 . 9 . 21 " <nl> # define PHP_SWOOLE_CHECK_CALLBACK <nl> # define PHP_SWOOLE_ENABLE_FASTCALL <nl> <nl>
|
update package . xml
|
swoole/swoole-src
|
df5e22fa402b8d3a8170e1e58b8998e077a72ada
|
2017-09-26T08:30:37Z
|
new file mode 100644 <nl> index 000000000000 . . c3c23c59d38f <nl> mmm / dev / null <nl> ppp b / jstests / replsets / chaining_removal . js <nl> <nl> + / / ensure removing a chained node does not break reporting of replication progress ( SERVER - 15849 ) <nl> + <nl> + ( function ( ) { <nl> + " use strict " ; <nl> + var numNodes = 5 ; <nl> + var host = getHostName ( ) ; <nl> + var name = " chaining_removal " ; <nl> + <nl> + var replTest = new ReplSetTest ( { name : name , nodes : numNodes } ) ; <nl> + var nodes = replTest . startSet ( ) ; <nl> + var port = replTest . ports ; <nl> + replTest . initiate ( { _id : name , members : <nl> + [ <nl> + { _id : 0 , host : nodes [ 0 ] . host , priority : 3 } , <nl> + { _id : 1 , host : nodes [ 1 ] . host } , <nl> + { _id : 2 , host : nodes [ 2 ] . host } , <nl> + { _id : 3 , host : nodes [ 3 ] . host } , <nl> + { _id : 4 , host : nodes [ 4 ] . host } , <nl> + ] , <nl> + } ) ; <nl> + var primary = replTest . getPrimary ( ) ; <nl> + / / force node 4 to chain through node 1 <nl> + assert . commandWorked ( nodes [ 4 ] . getDB ( " admin " ) . runCommand ( { " replSetSyncFrom " : nodes [ 1 ] . host } ) ) ; <nl> + var res ; <nl> + assert . soon ( function ( ) { <nl> + res = nodes [ 4 ] . getDB ( " admin " ) . runCommand ( { " replSetGetStatus " : 1 } ) ; <nl> + return res . syncingTo = = = nodes [ 1 ] . host ; <nl> + } , " node 4 failed to start chaining : " + tojson ( res ) ) ; <nl> + <nl> + / / write that should reach all nodes <nl> + var timeout = 15 * 1000 ; <nl> + var options = { writeConcern : { w : numNodes , wtimeout : timeout } } ; <nl> + assert . writeOK ( primary . getDB ( name ) . foo . insert ( { x : 1 } , options ) ) ; <nl> + <nl> + var config = primary . getDB ( " local " ) . system . replset . findOne ( ) ; <nl> + config . members . pop ( ) ; <nl> + config . version + + ; <nl> + / / remove node 4 <nl> + replTest . stop ( 4 ) ; <nl> + try { <nl> + primary . adminCommand ( { replSetReconfig : config } ) ; <nl> + } <nl> + catch ( e ) { <nl> + print ( " error : " + e ) ; <nl> + } <nl> + <nl> + / / ensure writing to all four nodes still works <nl> + primary = replTest . getPrimary ( ) ; <nl> + options . writeConcern . w = 4 ; <nl> + assert . writeOK ( primary . getDB ( name ) . foo . insert ( { x : 2 } , options ) ) ; <nl> + <nl> + replTest . stopSet ( ) ; <nl> + } ( ) ) ; <nl>
|
SERVER - 15849 add test for removing a chained member
|
mongodb/mongo
|
977abaaba51aeda3b4c6f0774aeb66b41aaa2274
|
2014-12-01T09:25:29Z
|
mmm a / CHANGELOG . md <nl> ppp b / CHANGELOG . md <nl> <nl> # ClickHouse release 1 . 1 . 54343 , 2018 - 02 - 05 <nl> <nl> * Added an ability to use macros for cluster name definition in distributed DDL queries and constructors of Distributed tables : ` CREATE TABLE distr ON CLUSTER ' { cluster } ' ( . . . ) ENGINE = Distributed ( ' { cluster } ' , ' db ' , ' table ' ) ` . <nl> - * Now computation of subqueries like ` SELECT . . . FROM table WHERE expr IN ( subquery ) ` uses the index of table ` table ` . <nl> + * Now index is used for conditions like ` expr IN ( subquery ) ` . <nl> * Improved duplicates processing during insertion into Replicated tables , now they do not slow down the replication queue execution . <nl> <nl> # ClickHouse release 1 . 1 . 54342 , 2018 - 01 - 22 <nl>
|
Update CHANGELOG . md
|
ClickHouse/ClickHouse
|
58117a1fccd3e185e37e4bb16608f4e0a336165b
|
2018-02-09T18:15:32Z
|
mmm a / Marlin / ultralcd . pde <nl> ppp b / Marlin / ultralcd . pde <nl> void MainMenu : : showStatus ( ) <nl> if ( ( tHotEnd1 ! = olddegHotEnd1 ) | | force_lcd_update ) <nl> { <nl> lcd . setCursor ( 11 , 0 ) ; <nl> - lcd . print ( ftostr3 ( tHotEnd0 ) ) ; <nl> - olddegHotEnd0 = tHotEnd0 ; <nl> + lcd . print ( ftostr3 ( tHotEnd1 ) ) ; <nl> + olddegHotEnd1 = tHotEnd1 ; <nl> } <nl> int ttHotEnd1 = intround ( degTargetHotend1 ( ) ) ; <nl> - if ( ( ttHotEnd1 ! = oldtargetHotEnd0 ) | | force_lcd_update ) <nl> + if ( ( ttHotEnd1 ! = oldtargetHotEnd1 ) | | force_lcd_update ) <nl> { <nl> lcd . setCursor ( 15 , 0 ) ; <nl> lcd . print ( ftostr3 ( ttHotEnd1 ) ) ; <nl> - oldtargetHotEnd0 = ttHotEnd1 ; <nl> + oldtargetHotEnd1 = ttHotEnd1 ; <nl> } <nl> # endif <nl> / / starttime = 2 ; <nl>
|
Show proper temperature for extruder 2
|
MarlinFirmware/Marlin
|
8e68c6cf89218636a2b6cce4fd3e6dcfe2c287fe
|
2012-04-27T13:00:01Z
|
mmm a / test / mjsunit / mjsunit . status <nl> ppp b / test / mjsunit / mjsunit . status <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> [ ' arch = = mipsel or arch = = mips ' , { <nl> <nl> + # Bug in zlib due to 35eb3a0260d349cb4201fed66ff62a438962bd47 <nl> + ' asm / embenchen / zlib ' : [ SKIP ] , <nl> + <nl> # Slow tests which times out in debug mode . <nl> ' try ' : [ PASS , [ ' mode = = debug ' , SKIP ] ] , <nl> ' debug - scripts - request ' : [ PASS , [ ' mode = = debug ' , SKIP ] ] , <nl> <nl> # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # <nl> [ ' arch = = mips64el ' , { <nl> <nl> + # Bug in zlib due to 35eb3a0260d349cb4201fed66ff62a438962bd47 <nl> + ' asm / embenchen / zlib ' : [ SKIP ] , <nl> + <nl> # Slow tests which times out in debug mode . <nl> ' try ' : [ PASS , [ ' mode = = debug ' , SKIP ] ] , <nl> ' debug - scripts - request ' : [ PASS , [ ' mode = = debug ' , SKIP ] ] , <nl>
|
MIPS : skip embenchen / zlib test .
|
v8/v8
|
ba08cc8c1507459ca278966f728c0af4d7d5ed4e
|
2015-06-29T17:25:12Z
|
mmm a / hphp / hack / src / parser / namespaces . ml <nl> ppp b / hphp / hack / src / parser / namespaces . ml <nl> let elaborate_defined_id nsenv kind ( p , id ) = <nl> if update_nsenv <nl> then { nsenv with ns_class_uses = SMap . add id newid nsenv . ns_class_uses } <nl> else nsenv in <nl> - let translated = renamespace_if_aliased <nl> - ( ParserOptions . auto_namespace_map nsenv . ns_popt ) newid in <nl> - ( p , translated ) , nsenv , update_nsenv <nl> + ( p , newid ) , nsenv , update_nsenv <nl> <nl> ( * Resolves an identifier in a given namespace environment . For example , if we <nl> * are in the namespace " N \ O " , the identifier " P \ Q " is resolved to " \ N \ O \ P \ Q " . <nl> let elaborate_defined_id nsenv kind ( p , id ) = <nl> * ) <nl> let elaborate_id_impl ~ autoimport nsenv kind ( p , id ) = <nl> ( * Go ahead and fully - qualify the name first . * ) <nl> + if id < > " " & & id . [ 0 ] = ' \ \ ' <nl> + then false , ( p , id ) <nl> + else <nl> let was_renamed , fully_qualified = <nl> - if id < > " " & & id . [ 0 ] = ' \ \ ' <nl> - then false , id <nl> - else <nl> begin <nl> ( * Expand " use " imports . * ) <nl> let ( bslash_loc , has_bslash ) = <nl> let elaborate_id_impl ~ autoimport nsenv kind ( p , id ) = <nl> end <nl> end <nl> end in <nl> - let translated = renamespace_if_aliased <nl> + let translated = renamespace_if_aliased ~ reverse : true <nl> ( ParserOptions . auto_namespace_map nsenv . ns_popt ) fully_qualified in <nl> was_renamed , ( p , translated ) <nl> <nl> mmm a / hphp / hack / test / integration_ml / ide / test_auto_ns_aliasing . ml <nl> ppp b / hphp / hack / test / integration_ml / ide / test_auto_ns_aliasing . ml <nl> module Test = Integration_test_base <nl> let foo_contents = <nl> " < ? hh / / strict <nl> <nl> - namespace HH \ \ LongName \ \ EvenLonger \ \ ShortName ; <nl> + namespace HH \ \ LongName \ \ ShortName ; <nl> <nl> function foo ( ) : void { } <nl> " <nl> let autocomplete_contents2 = <nl> " < ? hh / / strict <nl> <nl> function testTypecheck ( ) : void { <nl> - HH \ \ LongName \ \ EvenLonger \ \ ShortName \ \ foAUTO332 ; <nl> + HH \ \ LongName \ \ ShortName \ \ foAUTO332 ; <nl> } <nl> " <nl> <nl> let autocomplete_contents3 = <nl> " < ? hh / / strict <nl> <nl> function testTypecheck ( ) : void { <nl> - \ \ HH \ \ LongName \ \ EvenLonger \ \ ShortName \ \ foAUTO332 ; <nl> + \ \ HH \ \ LongName \ \ ShortName \ \ foAUTO332 ; <nl> } <nl> " <nl> <nl> let autocomplete_contents4 = <nl> namespace Test ; <nl> <nl> function testTypecheck ( ) : void { <nl> - HH \ \ LongName \ \ EvenLonger \ \ ShortName \ \ foAUTO332 ; <nl> + HH \ \ LongName \ \ ShortName \ \ foAUTO332 ; <nl> } <nl> " <nl> <nl> let autocomplete_contents5 = <nl> namespace Test ; <nl> <nl> function testTypecheck ( ) : void { <nl> - \ \ HH \ \ LongName \ \ EvenLonger \ \ ShortName \ \ foAUTO332 ; <nl> + \ \ HH \ \ LongName \ \ ShortName \ \ foAUTO332 ; <nl> } <nl> " <nl> <nl> let ( ) = <nl> ~ tco_dynamic_view : false <nl> ~ tco_disallow_array_as_tuple : false <nl> ~ po_auto_namespace_map : <nl> - [ ( " ShortName " , " HH \ \ LongName \ \ EvenLonger \ \ ShortName " ) ] <nl> + [ ( " ShortName " , " HH \ \ LongName \ \ ShortName " ) ] <nl> ~ po_deregister_php_stdlib : true <nl> ~ po_use_full_fidelity : true <nl> ~ tco_disallow_ambiguous_lambda : false <nl> let ( ) = <nl> <nl> let test_ide env contents i expected = <nl> let path = " test " ^ ( string_of_int i ) ^ " . php " in <nl> - let alias_regexp = Str . regexp " HH \ \ \ \ LongName \ \ \ \ EvenLonger \ \ \ \ " in <nl> - let contents = Str . replace_first alias_regexp " " contents in <nl> let offset = String_utils . substring_index " AUTO332 " contents in <nl> let position = File_content . offset_to_position contents offset in <nl> let line = position . File_content . line - 1 in <nl> let ( ) = <nl> let _ , loop_output = Test . ide_autocomplete env ( path , line , column ) in <nl> Test . assert_ide_autocomplete loop_output expected in <nl> <nl> - test_legacy env autocomplete_contents0 [ " ShortName \ \ foo " ] ; <nl> - test_legacy env autocomplete_contents1 [ " ShortName \ \ foo " ] ; <nl> - test_legacy env autocomplete_contents2 [ " ShortName \ \ foo " ] ; <nl> - test_legacy env autocomplete_contents3 [ " ShortName \ \ foo " ] ; <nl> + test_legacy env autocomplete_contents0 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> + test_legacy env autocomplete_contents1 [ " " ] ; <nl> + test_legacy env autocomplete_contents2 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> + test_legacy env autocomplete_contents3 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> test_legacy env autocomplete_contents4 [ " " ] ; <nl> - test_legacy env autocomplete_contents5 [ " ShortName \ \ foo " ] ; <nl> + test_legacy env autocomplete_contents5 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> test_legacy env autocomplete_contents6 [ " " ] ; <nl> - test_legacy env autocomplete_contents7 [ " ShortName \ \ foo " ] ; <nl> + test_legacy env autocomplete_contents7 [ " " ] ; <nl> <nl> - test_ide env autocomplete_contents0 0 [ " ShortName \ \ foo " ] ; <nl> - test_ide env autocomplete_contents1 1 [ " ShortName \ \ foo " ] ; <nl> - test_ide env autocomplete_contents2 2 [ " ShortName \ \ foo " ] ; <nl> - test_ide env autocomplete_contents3 3 [ " ShortName \ \ foo " ] ; <nl> + test_ide env autocomplete_contents0 0 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> + test_ide env autocomplete_contents1 1 [ ] ; <nl> + test_ide env autocomplete_contents2 2 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> + test_ide env autocomplete_contents3 3 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> test_ide env autocomplete_contents4 4 [ ] ; <nl> - test_ide env autocomplete_contents5 5 [ " ShortName \ \ foo " ] ; <nl> + test_ide env autocomplete_contents5 5 [ " HH \ \ LongName \ \ ShortName \ \ foo " ] ; <nl> test_ide env autocomplete_contents6 6 [ ] ; <nl> - test_ide env autocomplete_contents7 7 [ " ShortName \ \ foo " ] ; <nl> - <nl> + test_ide env autocomplete_contents7 7 [ ] ; <nl> ( ) <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing1 . php <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing1 . php <nl> function foo ( ) : int { <nl> return 1 ; <nl> } <nl> } <nl> + <nl> namespace { <nl> function main ( ) { <nl> expect_int ( Dict \ foo ( ) ) ; / / ok <nl> - expect_int ( \ Dict \ foo ( ) ) ; / / ok TODO ( T22617428 ) should be error <nl> + expect_int ( \ Dict \ foo ( ) ) ; / / error <nl> expect_int ( HH \ Lib \ Dict \ foo ( ) ) ; / / ok <nl> expect_int ( \ HH \ Lib \ Dict \ foo ( ) ) ; / / ok <nl> } <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing1 . php . exp <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing1 . php . exp <nl> @ @ - 1 + 1 , 4 @ @ <nl> - No errors <nl> + File " namespace_aliasing1 . php " , line 12 , characters 16 - 24 : <nl> + Unbound name : Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> + File " namespace_aliasing1 . php " , line 12 , characters 16 - 24 : <nl> + Unbound name : Dict \ foo ( a global constant ) ( Naming [ 2049 ] ) <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing2 . php <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing2 . php <nl> function foo ( ) : int { <nl> return 1 ; <nl> } <nl> } <nl> + <nl> namespace { <nl> function main ( ) { <nl> expect_int ( Dict \ foo ( ) ) ; / / error <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing2 . php . exp <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing2 . php . exp <nl> <nl> - File " namespace_aliasing2 . php " , line 10 , characters 16 - 23 : <nl> + File " namespace_aliasing2 . php " , line 11 , characters 16 - 23 : <nl> + Unbound name : HH \ Lib \ Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> + File " namespace_aliasing2 . php " , line 11 , characters 16 - 23 : <nl> + Unbound name : HH \ Lib \ Dict \ foo ( a global constant ) ( Naming [ 2049 ] ) <nl> + File " namespace_aliasing2 . php " , line 12 , characters 16 - 24 : <nl> Unbound name : Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> - File " namespace_aliasing2 . php " , line 10 , characters 16 - 23 : <nl> - Unbound name : Dict \ foo ( a global constant ) ( Naming [ 2049 ] ) <nl> - File " namespace_aliasing2 . php " , line 11 , characters 16 - 24 : <nl> - Unbound name : Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> - File " namespace_aliasing2 . php " , line 11 , characters 16 - 24 : <nl> + File " namespace_aliasing2 . php " , line 12 , characters 16 - 24 : <nl> Unbound name : Dict \ foo ( a global constant ) ( Naming [ 2049 ] ) <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing3 . php <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing3 . php <nl> function foo ( ) : int { <nl> namespace Main { <nl> function main ( ) { <nl> expect_int ( Dict \ foo ( ) ) ; / / error <nl> - expect_int ( \ Dict \ foo ( ) ) ; / / ok TODO ( T22617428 ) should be error <nl> + expect_int ( \ Dict \ foo ( ) ) ; / / error <nl> expect_int ( HH \ Lib \ Dict \ foo ( ) ) ; / / error <nl> expect_int ( \ HH \ Lib \ Dict \ foo ( ) ) ; / / ok <nl> } <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing3 . php . exp <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing3 . php . exp <nl> File " namespace_aliasing3 . php " , line 11 , characters 16 - 23 : <nl> Unbound name : Main \ Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> File " namespace_aliasing3 . php " , line 11 , characters 16 - 23 : <nl> Unbound name : Main \ Dict \ foo ( a global constant ) ( Naming [ 2049 ] ) <nl> + File " namespace_aliasing3 . php " , line 12 , characters 16 - 24 : <nl> + Unbound name : Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> + File " namespace_aliasing3 . php " , line 12 , characters 16 - 24 : <nl> + Unbound name : Dict \ foo ( a global constant ) ( Naming [ 2049 ] ) <nl> File " namespace_aliasing3 . php " , line 13 , characters 16 - 30 : <nl> Unbound name : Main \ HH \ Lib \ Dict \ foo ( a global function ) ( Naming [ 2049 ] ) <nl> File " namespace_aliasing3 . php " , line 13 , characters 16 - 30 : <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing4 . php <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing4 . php <nl> function foo ( ) : string { <nl> } <nl> <nl> namespace HH \ Lib \ Dict { <nl> - function foo ( ) : int { / / error <nl> + function foo ( ) : int { <nl> return 1 ; <nl> } <nl> } <nl> + <nl> namespace { <nl> function main ( ) { <nl> - expect_int ( Dict \ foo ( ) ) ; / / error <nl> + expect_int ( Dict \ foo ( ) ) ; / / ok <nl> expect_int ( \ Dict \ foo ( ) ) ; / / error <nl> } <nl> <nl> mmm a / hphp / hack / test / typecheck / namespace / namespace_aliasing4 . php . exp <nl> ppp b / hphp / hack / test / typecheck / namespace / namespace_aliasing4 . php . exp <nl> <nl> - File " namespace_aliasing4 . php " , line 10 , characters 12 - 14 : <nl> - Name already bound : Dict \ foo ( Naming [ 2012 ] ) <nl> - File " namespace_aliasing4 . php " , line 4 , characters 12 - 14 : <nl> - Previous definition is here <nl> - File " namespace_aliasing4 . php " , line 16 , characters 16 - 25 : <nl> + File " namespace_aliasing4 . php " , line 18 , characters 16 - 26 : <nl> Invalid argument ( Typing [ 4110 ] ) <nl> - File " namespace_aliasing4 . php " , line 20 , characters 23 - 25 : <nl> - This is an int <nl> - File " namespace_aliasing4 . php " , line 4 , characters 19 - 24 : <nl> - It is incompatible with a string <nl> - File " namespace_aliasing4 . php " , line 17 , characters 16 - 26 : <nl> - Invalid argument ( Typing [ 4110 ] ) <nl> - File " namespace_aliasing4 . php " , line 20 , characters 23 - 25 : <nl> + File " namespace_aliasing4 . php " , line 21 , characters 23 - 25 : <nl> This is an int <nl> File " namespace_aliasing4 . php " , line 4 , characters 19 - 24 : <nl> It is incompatible with a string <nl>
|
Make fully - qualified name the source of truth for namespace aliasing
|
facebook/hhvm
|
25be602c88d94137c5bf6cc6d781d05ffd481cbf
|
2018-07-09T18:17:55Z
|
mmm a / src / primitives / block . cpp <nl> ppp b / src / primitives / block . cpp <nl> <nl> # include " hash . h " <nl> # include " tinyformat . h " <nl> # include " utilstrencodings . h " <nl> + # include " crypto / common . h " <nl> <nl> uint256 CBlockHeader : : GetHash ( ) const <nl> { <nl> + # if defined ( WORDS_BIGENDIAN ) <nl> + uint8_t data [ 80 ] ; <nl> + WriteLE32 ( & data [ 0 ] , nVersion ) ; <nl> + memcpy ( & data [ 4 ] , hashPrevBlock . begin ( ) , hashPrevBlock . size ( ) ) ; <nl> + memcpy ( & data [ 36 ] , hashMerkleRoot . begin ( ) , hashMerkleRoot . size ( ) ) ; <nl> + WriteLE32 ( & data [ 68 ] , nTime ) ; <nl> + WriteLE32 ( & data [ 72 ] , nBits ) ; <nl> + WriteLE32 ( & data [ 76 ] , nNonce ) ; <nl> + return Hash ( data , data + 80 ) ; <nl> + # else / / Can take shortcut for little endian <nl> return Hash ( BEGIN ( nVersion ) , END ( nNonce ) ) ; <nl> + # endif <nl> } <nl> <nl> uint256 CBlock : : BuildMerkleTree ( bool * fMutated ) const <nl>
|
src / primitives / block . cpp : endian compatibility in GetHash
|
bitcoin/bitcoin
|
81aeb28436d847ed4e6bcda8c746a3e5631c7feb
|
2015-03-06T16:21:58Z
|
mmm a / jstests / fsync2 . js <nl> ppp b / jstests / fsync2 . js <nl> <nl> <nl> + function debug ( msg ) { <nl> + print ( " fsync2 : " + msg ) ; <nl> + } <nl> + <nl> function doTest ( ) { <nl> db . fsync2 . drop ( ) ; <nl> <nl> function doTest ( ) { <nl> d = db . getSisterDB ( " admin " ) ; <nl> <nl> assert . commandWorked ( d . runCommand ( { fsync : 1 , lock : 1 } ) ) ; <nl> + <nl> + debug ( " after lock " ) ; <nl> <nl> for ( i = 0 ; i < 200 ; i + + ) { <nl> + debug ( " loop : " + i ) ; <nl> assert . eq ( 1 , db . fsync2 . count ( ) ) ; <nl> - sleep ( 1 ) ; <nl> + sleep ( 100 ) ; <nl> } <nl> <nl> + debug ( " about to save " ) ; <nl> db . fsync2 . save ( { x : 1 } ) ; <nl> + debug ( " save done " ) ; <nl> <nl> m = new Mongo ( db . getMongo ( ) . host ) ; <nl> <nl>
|
diagnostics for fsync2
|
mongodb/mongo
|
aca83097ebcb23bc2397c61cc52a02f09b84b2df
|
2012-06-04T15:46:03Z
|
mmm a / include / rapidjson / document . h <nl> ppp b / include / rapidjson / document . h <nl> class GenericValue { <nl> } <nl> else { <nl> SizeType oldCapacity = o . capacity ; <nl> - o . capacity + = ( oldCapacity > > 1 ) ; / / grow by factor 1 . 5 <nl> + o . capacity + = ( oldCapacity + 1 ) / 2 ; / / grow by factor 1 . 5 <nl> o . members = reinterpret_cast < Member * > ( allocator . Realloc ( o . members , oldCapacity * sizeof ( Member ) , o . capacity * sizeof ( Member ) ) ) ; <nl> } <nl> } <nl> int z = a [ 0u ] . GetInt ( ) ; / / This works too . <nl> GenericValue & PushBack ( GenericValue & value , Allocator & allocator ) { <nl> RAPIDJSON_ASSERT ( IsArray ( ) ) ; <nl> if ( data_ . a . size > = data_ . a . capacity ) <nl> - Reserve ( data_ . a . capacity = = 0 ? kDefaultArrayCapacity : ( data_ . a . capacity + ( data_ . a . capacity > > 1 ) ) , allocator ) ; <nl> + Reserve ( data_ . a . capacity = = 0 ? kDefaultArrayCapacity : ( data_ . a . capacity + ( data_ . a . capacity + 1 ) / 2 ) , allocator ) ; <nl> data_ . a . elements [ data_ . a . size + + ] . RawAssign ( value ) ; <nl> return * this ; <nl> } <nl>
|
GenericValue : round up during capacity growth
|
Tencent/rapidjson
|
0d2761a59c48cd5694db7e53d3a092e97f028b09
|
2014-09-01T09:31:25Z
|
mmm a / x64_dbg_dbg / variable . cpp <nl> ppp b / x64_dbg_dbg / variable . cpp <nl> <nl> # include " variable . h " <nl> # include " threading . h " <nl> <nl> + / * * <nl> + \ brief The container that stores the variables . <nl> + * / <nl> static VariableMap variables ; <nl> - static VAR * vars ; <nl> <nl> - static void varsetvalue ( VAR * var , VAR_VALUE * value ) <nl> + / * * <nl> + \ brief Sets a variable with a value . <nl> + \ param [ in , out ] var The variable to set the value of . The previous value will be freed . Cannot be null . <nl> + \ param [ in ] value The new value . Cannot be null . <nl> + * / <nl> + static void varsetvalue ( VAR * var , const VAR_VALUE * value ) <nl> { <nl> switch ( var - > value . type ) <nl> { <nl> static void varsetvalue ( VAR * var , VAR_VALUE * value ) <nl> memcpy ( & var - > value , value , sizeof ( VAR_VALUE ) ) ; <nl> } <nl> <nl> - static bool varset ( const char * name , VAR_VALUE * value , bool setreadonly ) <nl> + / * * <nl> + \ brief Sets a variable by name . <nl> + \ param name The name of the variable . Cannot be null . <nl> + \ param value The new value . Cannot be null . <nl> + \ param setreadonly true to set read - only variables ( like $ hProcess etc . ) . <nl> + \ return true if the variable was set correctly , false otherwise . <nl> + * / <nl> + static bool varset ( const char * name , const VAR_VALUE * value , bool setreadonly ) <nl> { <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> String name_ ; <nl> static bool varset ( const char * name , VAR_VALUE * value , bool setreadonly ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Initializes various default variables . <nl> + * / <nl> void varinit ( ) <nl> { <nl> varfree ( ) ; <nl> void varinit ( ) <nl> varnew ( " $ _BS_FLAG " , 0 , VAR_READONLY ) ; / / bigger / smaller flag for internal use ( 1 = bigger , 0 = smaller ) <nl> } <nl> <nl> + / * * <nl> + \ brief Clears all variables . <nl> + * / <nl> void varfree ( ) <nl> { <nl> + / / TODO : correctly free variable data . <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> variables . clear ( ) ; <nl> } <nl> <nl> - VAR * vargetptr ( ) <nl> - { <nl> - return 0 ; <nl> - } <nl> - <nl> + / * * <nl> + \ brief Creates a new variable . <nl> + \ param name The name of the variable . You can specify alias names by separating the names by ' \ 1 ' . Cannot be null . <nl> + \ param value The new variable value . <nl> + \ param type The variable type . <nl> + \ return true if the new variables was created and set successfully , false otherwise . <nl> + * / <nl> bool varnew ( const char * name , uint value , VAR_TYPE type ) <nl> { <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> bool varnew ( const char * name , uint value , VAR_TYPE type ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Gets a variable value . <nl> + \ param name The name of the variable . <nl> + \ param [ out ] value This function can get the variable value . If this value is null , it is ignored . <nl> + \ param [ out ] size This function can get the variable size . If this value is null , it is ignored . <nl> + \ param [ out ] type This function can get the variable type . If this value is null , it is ignored . <nl> + \ return true if the variable was found and the optional values were retrieved successfully , false otherwise . <nl> + * / <nl> static bool varget ( const char * name , VAR_VALUE * value , int * size , VAR_TYPE * type ) <nl> { <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> static bool varget ( const char * name , VAR_VALUE * value , int * size , VAR_TYPE * type <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Gets a variable value . <nl> + \ param name The name of the variable . <nl> + \ param [ out ] value This function can get the variable value . If this value is null , it is ignored . <nl> + \ param [ out ] size This function can get the variable size . If this value is null , it is ignored . <nl> + \ param [ out ] type This function can get the variable type . If this value is null , it is ignored . <nl> + \ return true if the variable was found and the optional values were retrieved successfully , false otherwise . <nl> + * / <nl> bool varget ( const char * name , uint * value , int * size , VAR_TYPE * type ) <nl> { <nl> VAR_VALUE varvalue ; <nl> bool varget ( const char * name , uint * value , int * size , VAR_TYPE * type ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Gets a variable value . <nl> + \ param name The name of the variable . <nl> + \ param [ out ] string This function can get the variable value . If this value is null , it is ignored . <nl> + \ param [ out ] size This function can get the variable size . If this value is null , it is ignored . <nl> + \ param [ out ] type This function can get the variable type . If this value is null , it is ignored . <nl> + \ return true if the variable was found and the optional values were retrieved successfully , false otherwise . <nl> + * / <nl> bool varget ( const char * name , char * string , int * size , VAR_TYPE * type ) <nl> { <nl> VAR_VALUE varvalue ; <nl> bool varget ( const char * name , char * string , int * size , VAR_TYPE * type ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Sets a variable by name . <nl> + \ param name The name of the variable . Cannot be null . <nl> + \ param value The new value . <nl> + \ param setreadonly true to set read - only variables ( like $ hProcess etc . ) . <nl> + \ return true if the variable was set successfully , false otherwise . <nl> + * / <nl> bool varset ( const char * name , uint value , bool setreadonly ) <nl> { <nl> VAR_VALUE varvalue ; <nl> bool varset ( const char * name , uint value , bool setreadonly ) <nl> return varset ( name , & varvalue , setreadonly ) ; <nl> } <nl> <nl> + / * * <nl> + \ brief Sets a variable by name . <nl> + \ param name The name of the variable . Cannot be null . <nl> + \ param string The new value . Cannot be null . <nl> + \ param setreadonly true to set read - only variables ( like $ hProcess etc . ) . <nl> + \ return true if the variable was set successfully , false otherwise . <nl> + * / <nl> bool varset ( const char * name , const char * string , bool setreadonly ) <nl> { <nl> VAR_VALUE varvalue ; <nl> bool varset ( const char * name , const char * string , bool setreadonly ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Deletes a variable . <nl> + \ param name The name of the variable to delete . Cannot be null . <nl> + \ param delsystem true to allow deleting system variables . <nl> + \ return true if the variable was deleted successfully , false otherwise . <nl> + * / <nl> bool vardel ( const char * name , bool delsystem ) <nl> { <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> bool vardel ( const char * name , bool delsystem ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Gets a variable type . <nl> + \ param name The name of the variable . Cannot be null . <nl> + \ param [ out ] type This function can retrieve the variable type . If null it is ignored . <nl> + \ param [ out ] valtype This function can retrieve the variable value type . If null it is ignored . <nl> + \ return true if getting the type was successful , false otherwise . <nl> + * / <nl> bool vargettype ( const char * name , VAR_TYPE * type , VAR_VALUE_TYPE * valtype ) <nl> { <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> bool vargettype ( const char * name , VAR_TYPE * type , VAR_VALUE_TYPE * valtype ) <nl> return true ; <nl> } <nl> <nl> + / * * <nl> + \ brief Enumerates all variables . <nl> + \ param [ in , out ] entries A pointer to place the variables in . If null , \ p cbsize will be filled to the number of bytes required . <nl> + \ param [ in , out ] cbsize This function retrieves the number of bytes required to store all variables . Can be null if \ p entries is not null . <nl> + \ return true if it succeeds , false if it fails . <nl> + * / <nl> bool varenum ( VAR * entries , size_t * cbsize ) <nl> { <nl> CriticalSectionLocker locker ( LockVariables ) ; <nl> mmm a / x64_dbg_dbg / variable . h <nl> ppp b / x64_dbg_dbg / variable . h <nl> typedef std : : map < String , VAR , CaseInsensitiveCompare > VariableMap ; <nl> / / functions <nl> void varinit ( ) ; <nl> void varfree ( ) ; <nl> - VAR * vargetptr ( ) ; <nl> bool varnew ( const char * name , uint value , VAR_TYPE type ) ; <nl> bool varget ( const char * name , uint * value , int * size , VAR_TYPE * type ) ; <nl> bool varget ( const char * name , char * string , int * size , VAR_TYPE * type ) ; <nl>
|
DBG : documented variable . cpp
|
x64dbg/x64dbg
|
c39a11d8cb3b60c6ff38b5c53b97abb6c7639368
|
2014-12-26T11:35:19Z
|
mmm a / src / rpcserver . cpp <nl> ppp b / src / rpcserver . cpp <nl> static bool HTTPReq_JSONRPC ( AcceptedConnection * conn , <nl> if ( ! valRequest . read ( strRequest ) ) <nl> throw JSONRPCError ( RPC_PARSE_ERROR , " Parse error " ) ; <nl> <nl> - / / Return immediately if in warmup <nl> - { <nl> - LOCK ( cs_rpcWarmup ) ; <nl> - if ( fRPCInWarmup ) <nl> - throw JSONRPCError ( RPC_IN_WARMUP , rpcWarmupStatus ) ; <nl> - } <nl> - <nl> string strReply ; <nl> <nl> / / singleton request <nl> void ServiceConnection ( AcceptedConnection * conn ) <nl> <nl> UniValue CRPCTable : : execute ( const std : : string & strMethod , const UniValue & params ) const <nl> { <nl> + / / Return immediately if in warmup <nl> + { <nl> + LOCK ( cs_rpcWarmup ) ; <nl> + if ( fRPCInWarmup ) <nl> + throw JSONRPCError ( RPC_IN_WARMUP , rpcWarmupStatus ) ; <nl> + } <nl> + <nl> / / Find method <nl> const CRPCCommand * pcmd = tableRPC [ strMethod ] ; <nl> if ( ! pcmd ) <nl>
|
When processing RPC commands during warmup phase , parse the
|
bitcoin/bitcoin
|
72b9452b1d5ff8761466e9810facfd50103cc63b
|
2015-07-02T01:55:08Z
|
new file mode 100644 <nl> index 000000000000 . . f38361948a0b <nl> mmm / dev / null <nl> ppp b / tools / swiftdt / Sources / swiftdt / Metadata . swift <nl> <nl> + / / <nl> + / / File . swift <nl> + / / <nl> + / / <nl> + / / Created by Ben Cohen on 5 / 16 / 20 . <nl> + / / <nl> + <nl> + import SwiftRemoteMirror <nl> + <nl> + struct Allocation { <nl> + let allocation_t : swift_metadata_allocation_t <nl> + <nl> + var tag : swift_metadata_allocation_tag_t { allocation_t . Tag } <nl> + var ptr : swift_reflection_ptr_t { allocation_t . Ptr } <nl> + var size : Int { Int ( allocation_t . Size ) } <nl> + } <nl> + <nl> + extension Allocation : Comparable { <nl> + static func = = ( lhs : Self , rhs : Self ) - > Bool { <nl> + lhs . ptr = = rhs . ptr <nl> + } <nl> + <nl> + static func < ( lhs : Self , rhs : Self ) - > Bool { <nl> + lhs . ptr < rhs . ptr <nl> + } <nl> + } <nl> + <nl> + extension Allocation { <nl> + func metadata ( in context : SwiftReflectionContextRef ) - > Metadata ? { <nl> + let ptr = context . metadataPointer ( allocation : allocation_t ) <nl> + if ptr ! = 0 { <nl> + let name = context . name ( metadata : ptr ) ? ? " < unknown > " <nl> + return . init ( ptr : ptr , name : name ) <nl> + } else { <nl> + return nil <nl> + } <nl> + } <nl> + } <nl> + <nl> + struct Metadata { <nl> + let ptr : swift_reflection_ptr_t <nl> + let name : String <nl> + } <nl> mmm a / tools / swiftdt / Sources / swiftdt / RemoteMirrorExtensions . swift <nl> ppp b / tools / swiftdt / Sources / swiftdt / RemoteMirrorExtensions . swift <nl> extension SwiftReflectionContextRef { <nl> throw Error ( cString : str ) <nl> } <nl> } <nl> + <nl> + var allocations : [ Allocation ] { <nl> + var allocations : [ Allocation ] = [ ] <nl> + try ! iterateMetadataAllocations { allocation_t in <nl> + allocations . append ( . init ( allocation_t : allocation_t ) ) <nl> + } <nl> + return allocations <nl> + } <nl> } <nl> mmm a / tools / swiftdt / Sources / swiftdt / main . swift <nl> ppp b / tools / swiftdt / Sources / swiftdt / main . swift <nl> func dumpConformanceCache ( context : SwiftReflectionContextRef ) throws { <nl> } <nl> <nl> func dumpMetadataAllocations ( context : SwiftReflectionContextRef ) throws { <nl> - var allocations : [ swift_metadata_allocation_t ] = [ ] <nl> - var metadatas : [ swift_reflection_ptr_t ] = [ ] <nl> - try context . iterateMetadataAllocations { allocation in <nl> - allocations . append ( allocation ) <nl> - print ( " Metadata allocation at : \ ( hex : allocation . Ptr ) " + <nl> - " size : \ ( allocation . Size ) tag : \ ( allocation . Tag ) " ) <nl> - let ptr = context . metadataPointer ( allocation : allocation ) <nl> - if ptr ! = 0 { <nl> - metadatas . append ( ptr ) <nl> - } <nl> + var allocations = context . allocations <nl> + for allocation in allocations { <nl> + print ( " Metadata allocation at : \ ( hex : allocation . ptr ) " + <nl> + " size : \ ( allocation . size ) tag : \ ( allocation . tag ) " ) <nl> } <nl> + <nl> + allocations . sort ( ) <nl> + let metadatas = allocations . compactMap { $ 0 . metadata ( in : context ) } <nl> <nl> - allocations . sort { $ 0 . Ptr < $ 1 . Ptr } <nl> for metadata in metadatas { <nl> - let name = context . name ( metadata : metadata ) ? ? " < unknown > " <nl> - print ( " Metadata \ ( hex : metadata ) " ) <nl> - print ( " Name : \ ( name ) " ) <nl> - <nl> - if let allocation = allocations . last ( where : { metadata > = $ 0 . Ptr } ) { <nl> - let offset = metadata - allocation . Ptr <nl> - print ( " In allocation \ ( hex : allocation . Ptr ) " + <nl> - " size \ ( allocation . Size ) at offset \ ( offset ) " ) <nl> + print ( " Metadata \ ( hex : metadata . ptr ) " ) <nl> + print ( " Name : \ ( metadata . name ) " ) <nl> + <nl> + if let allocation = allocations . last ( where : { metadata . ptr > = $ 0 . ptr } ) { <nl> + let offset = metadata . ptr - allocation . ptr <nl> + print ( " In allocation \ ( hex : allocation . ptr ) " + <nl> + " size \ ( allocation . size ) at offset \ ( offset ) " ) <nl> } else { <nl> print ( " Not in any known metadata allocation . How strange . " ) <nl> } <nl>
|
Wrap allocations / metadatas
|
apple/swift
|
b8b9fc7496b706771bec289ddc525cc20ad61b8f
|
2020-05-29T15:31:04Z
|
mmm a / jstests / sharding / txn_commit_optimizations_for_read_only_shards . js <nl> ppp b / jstests / sharding / txn_commit_optimizations_for_read_only_shards . js <nl> const failureModes = { <nl> beforeCommit : ( ) = > { <nl> / / Participant primary steps down . <nl> assert . commandWorked ( <nl> - st . shard0 . adminCommand ( { replSetStepDown : 60 / * stepDownSecs * / , force : true } ) ) ; <nl> + st . shard0 . adminCommand ( { replSetStepDown : 1 / * stepDownSecs * / , force : true } ) ) ; <nl> } , <nl> getCommitCommand : ( lsid , txnNumber ) = > { <nl> return addTxnFields ( defaultCommitCommand , lsid , txnNumber ) ; <nl>
|
Revert " SERVER - 42214 Increase stepdown timeout in txn_commit_optimizations_for_read_only_shards . js "
|
mongodb/mongo
|
421c6e8669d5c1a741346541a23c680f6b05770e
|
2019-07-30T13:24:28Z
|
mmm a / dbms / src / Functions / FunctionsConversion . h <nl> ppp b / dbms / src / Functions / FunctionsConversion . h <nl> struct ToIntMonotonicity <nl> if ( ! type . isValueRepresentedByNumber ( ) ) <nl> return { } ; <nl> <nl> - size_t size_of_type = type . getSizeOfValueInMemory ( ) ; <nl> - <nl> - / / / If type is expanding <nl> - if ( sizeof ( T ) > size_of_type ) <nl> - { <nl> - / / / If convert signed - > signed or unsigned - > signed , then function is monotonic . <nl> - if ( std : : is_signed_v < T > | | type . isValueRepresentedByUnsignedInteger ( ) ) <nl> - return { true , true , true } ; <nl> - <nl> - / / / If arguments from the same half , then function is monotonic . <nl> - if ( ( left . get < Int64 > ( ) > = 0 ) = = ( right . get < Int64 > ( ) > = 0 ) ) <nl> - return { true , true , true } ; <nl> - } <nl> - <nl> - / / / If type is same , too . ( Enum has separate case , because it is different data type ) <nl> + / / / If type is same , the conversion is always monotonic . <nl> + / / / ( Enum has separate case , because it is different data type ) <nl> if ( checkAndGetDataType < DataTypeNumber < T > > ( & type ) | | <nl> checkAndGetDataType < DataTypeEnum < T > > ( & type ) ) <nl> return { true , true , true } ; <nl> <nl> - / / / In other cases , if range is unbounded , we don ' t know , whether function is monotonic or not . <nl> - if ( left . isNull ( ) | | right . isNull ( ) ) <nl> - return { } ; <nl> + / / / Float cases . <nl> + <nl> + / / / When converting to Float , the conversion is always monotonic . <nl> + if ( std : : is_floating_point_v < T > ) <nl> + return { true , true , true } ; <nl> <nl> - / / / If converting from float , for monotonicity , arguments must fit in range of result type . <nl> + / / / If converting from Float , for monotonicity , arguments must fit in range of result type . <nl> if ( WhichDataType ( type ) . isFloat ( ) ) <nl> { <nl> + if ( left . isNull ( ) | | right . isNull ( ) ) <nl> + return { } ; <nl> + <nl> Float64 left_float = left . get < Float64 > ( ) ; <nl> Float64 right_float = right . get < Float64 > ( ) ; <nl> <nl> struct ToIntMonotonicity <nl> return { } ; <nl> } <nl> <nl> - / / / If signedness of type is changing , or converting from Date , DateTime , then arguments must be from same half , <nl> - / / / and after conversion , resulting values must be from same half . <nl> - / / / Just in case , it is required in rest of cases too . <nl> - if ( ( left . get < Int64 > ( ) > = 0 ) ! = ( right . get < Int64 > ( ) > = 0 ) <nl> - | | ( T ( left . get < Int64 > ( ) ) > = 0 ) ! = ( T ( right . get < Int64 > ( ) ) > = 0 ) ) <nl> - return { } ; <nl> + / / / Integer cases . <nl> + <nl> + bool from_is_unsigned = type . isValueRepresentedByUnsignedInteger ( ) ; <nl> + bool to_is_unsigned = std : : is_unsigned_v < T > ; <nl> + <nl> + size_t size_of_from = type . getSizeOfValueInMemory ( ) ; <nl> + size_t size_of_to = sizeof ( T ) ; <nl> + <nl> + bool left_in_first_half = left . isNull ( ) <nl> + ? from_is_unsigned <nl> + : left . get < Int64 > ( ) > = 0 ; <nl> + <nl> + bool right_in_first_half = right . isNull ( ) <nl> + ? ! from_is_unsigned <nl> + : right . get < Int64 > ( ) > = 0 ; <nl> + <nl> + / / / Size of type is the same . <nl> + if ( size_of_from = = size_of_to ) <nl> + { <nl> + if ( from_is_unsigned = = to_is_unsigned ) <nl> + return { true , true , true } ; <nl> + <nl> + if ( left_in_first_half = = right_in_first_half ) <nl> + return { true } ; <nl> <nl> - / / / If type is shrinked , then for monotonicity , all bits other than that fits , must be same . <nl> - if ( divideByRangeOfType ( left . get < UInt64 > ( ) ) ! = divideByRangeOfType ( right . get < UInt64 > ( ) ) ) <nl> return { } ; <nl> + } <nl> <nl> - return { true } ; <nl> + / / / Size of type is expanded . <nl> + if ( size_of_from < size_of_to ) <nl> + { <nl> + if ( from_is_unsigned = = to_is_unsigned ) <nl> + return { true , true , true } ; <nl> + <nl> + if ( ! to_is_unsigned ) <nl> + return { true , true , true } ; <nl> + <nl> + / / / signed - > unsigned . If arguments from the same half , then function is monotonic . <nl> + if ( left_in_first_half = = right_in_first_half ) <nl> + return { true } ; <nl> + } <nl> + <nl> + / / / Size of type is shrinked . <nl> + if ( size_of_from > size_of_to ) <nl> + { <nl> + / / / Function cannot be monotonic on unbounded ranges . <nl> + if ( left . isNull ( ) | | right . isNull ( ) ) <nl> + return { } ; <nl> + <nl> + if ( from_is_unsigned = = to_is_unsigned ) <nl> + { <nl> + / / / all bits other than that fits , must be same . <nl> + if ( divideByRangeOfType ( left . get < UInt64 > ( ) ) = = divideByRangeOfType ( right . get < UInt64 > ( ) ) ) <nl> + return { true } ; <nl> + <nl> + return { } ; <nl> + } <nl> + else <nl> + { <nl> + / / / When signedness is changed , it ' s also required for arguments to be from the same half . <nl> + if ( left_in_first_half = = right_in_first_half <nl> + & & divideByRangeOfType ( left . get < UInt64 > ( ) ) = = divideByRangeOfType ( right . get < UInt64 > ( ) ) ) <nl> + return { true } ; <nl> + <nl> + return { } ; <nl> + } <nl> + } <nl> + <nl> + __builtin_unreachable ( ) ; <nl> } <nl> } ; <nl> <nl> mmm a / dbms / tests / queries / 0_stateless / 00653_verification_monotonic_data_load . sh <nl> ppp b / dbms / tests / queries / 0_stateless / 00653_verification_monotonic_data_load . sh <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . signed_integer_test_table <nl> <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toInt64 ( val ) = = 0 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : UInt32 - > Int64 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toUInt64 ( val ) = = 0 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : UInt32 - > UInt64 " <nl> - $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toInt32 ( val ) = = 0 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : UInt32 - > Int32 " <nl> + $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toInt32 ( val ) = = 0 ; " 2 > & 1 | grep - q " 2 marks to read from " & & echo " monotonic int case : UInt32 - > Int32 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toUInt32 ( val ) = = 0 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : UInt32 - > UInt32 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toInt16 ( val ) = = 0 ; " 2 > & 1 | grep - q " 4 marks to read from " & & echo " monotonic int case : UInt32 - > Int16 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . unsigned_integer_test_table WHERE toUInt16 ( val ) = = 0 ; " 2 > & 1 | grep - q " 4 marks to read from " & & echo " monotonic int case : UInt32 - > UInt16 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . enum_test_table WHERE toU <nl> <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toInt32 ( val ) = = 1 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : Date - > Int32 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toUInt32 ( val ) = = 1 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : Date - > UInt32 " <nl> - $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toInt16 ( val ) = = 1 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : Date - > Int16 " <nl> + $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toInt16 ( val ) = = 1 ; " 2 > & 1 | grep - q " 2 marks to read from " & & echo " monotonic int case : Date - > Int16 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toUInt16 ( val ) = = 1 ; " 2 > & 1 | grep - q " 1 marks to read from " & & echo " monotonic int case : Date - > UInt16 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toInt8 ( val ) = = 1 ; " 2 > & 1 | grep - q " 5 marks to read from " & & echo " monotonic int case : Date - > Int8 " <nl> $ { CLICKHOUSE_CLIENT } - - query = " SELECT count ( ) FROM test . date_test_table WHERE toUInt8 ( val ) = = 1 ; " 2 > & 1 | grep - q " 5 marks to read from " & & echo " monotonic int case : Date - > UInt8 " <nl>
|
Rewrite code to calculate integer conversion function monotonicity ; fixed test
|
ClickHouse/ClickHouse
|
b624add2e782ee7110c9575c917e78615c072f00
|
2018-12-24T15:46:55Z
|
mmm a / Marlin / src / feature / pause . h <nl> ppp b / Marlin / src / feature / pause . h <nl> bool load_filament ( const float & slow_load_length = 0 , const float & fast_load_lengt <nl> <nl> bool unload_filament ( const float & unload_length , const bool show_lcd = false , const AdvancedPauseMode mode = ADVANCED_PAUSE_MODE_PAUSE_PRINT ) ; <nl> <nl> - # endif / / ADVANCED_PAUSE_FEATURE <nl> + # endif / / ADVANCED_PAUSE_FEATURE <nl> mmm a / Marlin / src / gcode / feature / pause / M125 . cpp <nl> ppp b / Marlin / src / gcode / feature / pause / M125 . cpp <nl> void GcodeSuite : : M125 ( ) { <nl> park_point . y + = ( active_extruder ? hotend_offset [ Y_AXIS ] [ active_extruder ] : 0 ) ; <nl> # endif <nl> <nl> + # if ENABLED ( SDSUPPORT ) <nl> + const bool sd_printing = IS_SD_PRINTING ( ) ; <nl> + # else <nl> + constexpr bool sd_printing = false ; <nl> + # endif <nl> + <nl> if ( pause_print ( retract , park_point ) ) { <nl> - # if ENABLED ( SDSUPPORT ) <nl> - const bool sd_printing = IS_SD_PRINTING ( ) | | parser . boolval ( ' S ' ) ; / / Undocumented parameter <nl> - # else <nl> - constexpr bool sd_printing = false ; <nl> - # endif <nl> if ( ! sd_printing ) { <nl> wait_for_confirmation ( ) ; <nl> resume_print ( ) ; <nl> mmm a / Marlin / src / gcode / sdcard / M20 - M30_M32 - M34_M524_M928 . cpp <nl> ppp b / Marlin / src / gcode / sdcard / M20 - M30_M32 - M34_M524_M928 . cpp <nl> void GcodeSuite : : M24 ( ) { <nl> <nl> # if ENABLED ( POWER_LOSS_RECOVERY ) <nl> if ( parser . seenval ( ' S ' ) ) card . setIndex ( parser . value_long ( ) ) ; <nl> + if ( parser . seenval ( ' T ' ) ) print_job_timer . resume ( parser . value_long ( ) ) ; <nl> # endif <nl> <nl> card . startFileprint ( ) ; <nl> - <nl> - # if ENABLED ( POWER_LOSS_RECOVERY ) <nl> - if ( parser . seenval ( ' T ' ) ) <nl> - print_job_timer . resume ( parser . value_long ( ) ) ; <nl> - else <nl> - # endif <nl> - print_job_timer . start ( ) ; <nl> - <nl> + print_job_timer . start ( ) ; <nl> ui . reset_status ( ) ; <nl> } <nl> <nl> void GcodeSuite : : M24 ( ) { <nl> * M25 : Pause SD Print <nl> * / <nl> void GcodeSuite : : M25 ( ) { <nl> - card . pauseSDPrint ( ) ; <nl> - print_job_timer . pause ( ) ; <nl> - <nl> # if ENABLED ( PARK_HEAD_ON_PAUSE ) <nl> - enqueue_and_echo_commands_P ( PSTR ( " M125 S " ) ) ; / / To be last in the buffer , must enqueue after pauseSDPrint <nl> + M125 ( ) ; <nl> + # else <nl> + card . pauseSDPrint ( ) ; <nl> + print_job_timer . pause ( ) ; <nl> + ui . reset_status ( ) ; <nl> # endif <nl> } <nl> <nl> mmm a / Marlin / src / lcd / menu / menu_main . cpp <nl> ppp b / Marlin / src / lcd / menu / menu_main . cpp <nl> <nl> # else <nl> card . startFileprint ( ) ; <nl> print_job_timer . start ( ) ; <nl> + ui . reset_status ( ) ; <nl> # endif <nl> - ui . reset_status ( ) ; <nl> } <nl> <nl> void lcd_sdcard_stop ( ) { <nl> mmm a / Marlin / src / libs / stopwatch . cpp <nl> ppp b / Marlin / src / libs / stopwatch . cpp <nl> bool Stopwatch : : start ( ) { <nl> else return false ; <nl> } <nl> <nl> - void Stopwatch : : resume ( const millis_t duration ) { <nl> + void Stopwatch : : resume ( const millis_t with_time ) { <nl> # if ENABLED ( DEBUG_STOPWATCH ) <nl> Stopwatch : : debug ( PSTR ( " resume " ) ) ; <nl> # endif <nl> <nl> reset ( ) ; <nl> - if ( ( accumulator = duration ) ) state = RUNNING ; <nl> + if ( ( accumulator = with_time ) ) state = RUNNING ; <nl> } <nl> <nl> void Stopwatch : : reset ( ) { <nl> mmm a / Marlin / src / libs / stopwatch . h <nl> ppp b / Marlin / src / libs / stopwatch . h <nl> class Stopwatch { <nl> * @ brief Resume the stopwatch <nl> * @ details Resume a timer from a given duration <nl> * / <nl> - static void resume ( const millis_t duration ) ; <nl> + static void resume ( const millis_t with_time ) ; <nl> <nl> / * * <nl> * @ brief Reset the stopwatch <nl>
|
Fix pause / resume SD print
|
MarlinFirmware/Marlin
|
261c6f4b96541435de786ddbafd491bc2a9d3bc6
|
2018-12-01T01:23:08Z
|
new file mode 100644 <nl> index 000000000000 . . 3e63ca0bca1e <nl> mmm / dev / null <nl> ppp b / validation - test / compiler_crashers / 28697 - anonymous - namespace - findcapturedvars - checktype - swift - type - swift - sourceloc . swift <nl> <nl> + / / This source file is part of the Swift . org open source project <nl> + / / Copyright ( c ) 2014 - 2017 Apple Inc . and the Swift project authors <nl> + / / Licensed under Apache License v2 . 0 with Runtime Library Exception <nl> + / / <nl> + / / See https : / / swift . org / LICENSE . txt for license information <nl> + / / See https : / / swift . org / CONTRIBUTORS . txt for the list of Swift project authors <nl> + <nl> + / / RUN : not - - crash % target - swift - frontend % s - emit - ir <nl> + { { extension { init ( UInt = _ = 1 + 1 as ? Int ? Int ) { var f = nil ? Int <nl>
|
Merge remote - tracking branch ' origin / master ' into master - next
|
apple/swift
|
34b1f310716c44186f1bd9bb50a769c1a9a29e69
|
2017-02-20T09:58:28Z
|
mmm a / folly / Portability . h <nl> ppp b / folly / Portability . h <nl> constexpr bool kHasUnalignedAccess = false ; <nl> # define FOLLY_ALWAYS_INLINE inline <nl> # endif <nl> <nl> - / / target <nl> - # ifdef _MSC_VER <nl> - # define FOLLY_TARGET_ATTRIBUTE ( target ) <nl> - # else <nl> - # define FOLLY_TARGET_ATTRIBUTE ( target ) __attribute__ ( ( __target__ ( target ) ) ) <nl> - # endif <nl> - <nl> / / detection for 64 bit <nl> # if defined ( __x86_64__ ) | | defined ( _M_X64 ) <nl> # define FOLLY_X64 1 <nl> mmm a / folly / experimental / Instructions . h <nl> ppp b / folly / experimental / Instructions . h <nl> <nl> # pragma once <nl> <nl> # include < glog / logging . h > <nl> - # include < immintrin . h > <nl> <nl> # include < folly / CpuId . h > <nl> - # include < folly / portability / Builtins . h > <nl> <nl> namespace folly { namespace compression { namespace instructions { <nl> <nl> struct Nehalem : public Default { <nl> static bool supported ( const folly : : CpuId & cpuId = { } ) { <nl> return cpuId . popcnt ( ) ; <nl> } <nl> - static inline uint64_t popcount ( uint64_t value ) <nl> - FOLLY_TARGET_ATTRIBUTE ( " popcnt " ) { <nl> + static inline uint64_t popcount ( uint64_t value ) { <nl> / / POPCNT is supported starting with Intel Nehalem , AMD K10 . <nl> - # if defined ( __GNUC__ ) & & ! __GNUC_PREREQ ( 4 , 9 ) <nl> - / / GCC 4 . 8 doesn ' t support the intrinsics . <nl> uint64_t result ; <nl> asm ( " popcntq % 1 , % 0 " : " = r " ( result ) : " r " ( value ) ) ; <nl> return result ; <nl> - # else <nl> - return _mm_popcnt_u64 ( value ) ; <nl> - # endif <nl> } <nl> } ; <nl> <nl> struct Haswell : public Nehalem { <nl> static bool supported ( const folly : : CpuId & cpuId = { } ) { <nl> return Nehalem : : supported ( cpuId ) & & cpuId . bmi1 ( ) ; <nl> } <nl> - static inline uint64_t blsr ( uint64_t value ) FOLLY_TARGET_ATTRIBUTE ( " bmi " ) { <nl> + static inline uint64_t blsr ( uint64_t value ) { <nl> / / BMI1 is supported starting with Intel Haswell , AMD Piledriver . <nl> / / BLSR combines two instuctions into one and reduces register pressure . <nl> - # if defined ( __GNUC__ ) & & ! __GNUC_PREREQ ( 4 , 9 ) <nl> - / / GCC 4 . 8 doesn ' t support the intrinsics . <nl> uint64_t result ; <nl> asm ( " blsrq % 1 , % 0 " : " = r " ( result ) : " r " ( value ) ) ; <nl> return result ; <nl> - # else <nl> - return _blsr_u64 ( value ) ; <nl> - # endif <nl> } <nl> } ; <nl> <nl> mmm a / folly / experimental / Select64 . h <nl> ppp b / folly / experimental / Select64 . h <nl> inline uint64_t select64 ( uint64_t x , uint64_t k ) { <nl> return place + detail : : kSelectInByte [ ( ( x > > place ) & 0xFF ) | ( byteRank < < 8 ) ] ; <nl> } <nl> <nl> - template < > <nl> - uint64_t select64 < compression : : instructions : : Haswell > ( uint64_t x , uint64_t k ) <nl> - FOLLY_TARGET_ATTRIBUTE ( " bmi , bmi2 " ) ; <nl> - <nl> template < > <nl> inline uint64_t select64 < compression : : instructions : : Haswell > ( uint64_t x , <nl> uint64_t k ) { <nl> - # if defined ( __GNUC__ ) & & ! __GNUC_PREREQ ( 4 , 9 ) <nl> - / / GCC 4 . 8 doesn ' t support the intrinsics . <nl> uint64_t result = uint64_t ( 1 ) < < k ; <nl> <nl> asm ( " pdep % 1 , % 0 , % 0 \ n \ t " <nl> inline uint64_t select64 < compression : : instructions : : Haswell > ( uint64_t x , <nl> : " r " ( x ) ) ; <nl> <nl> return result ; <nl> - # else <nl> - return _tzcnt_u64 ( _pdep_u64 ( x , 1ULL < < k ) ) ; <nl> - # endif <nl> } <nl> <nl> } / / namespace folly <nl>
|
Reverted commit D3265572
|
facebook/folly
|
0759dee48fca5973414d86505c8cd2ea82ec3a39
|
2016-05-09T07:20:24Z
|
mmm a / src / qt / forms / coincontroldialog . ui <nl> ppp b / src / qt / forms / coincontroldialog . ui <nl> <nl> < customwidget > <nl> < class > CoinControlTreeWidget < / class > <nl> < extends > QTreeWidget < / extends > <nl> - < header > coincontroltreewidget . h < / header > <nl> + < header > qt / coincontroltreewidget . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < resources / > <nl> mmm a / src / qt / forms / debugwindow . ui <nl> ppp b / src / qt / forms / debugwindow . ui <nl> <nl> < customwidget > <nl> < class > TrafficGraphWidget < / class > <nl> < extends > QWidget < / extends > <nl> - < header > trafficgraphwidget . h < / header > <nl> + < header > qt / trafficgraphwidget . h < / header > <nl> < container > 1 < / container > <nl> < slots > <nl> < slot > clear ( ) < / slot > <nl> mmm a / src / qt / forms / editaddressdialog . ui <nl> ppp b / src / qt / forms / editaddressdialog . ui <nl> <nl> < customwidget > <nl> < class > QValidatedLineEdit < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > qvalidatedlineedit . h < / header > <nl> + < header > qt / qvalidatedlineedit . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < resources / > <nl> mmm a / src / qt / forms / modaloverlay . ui <nl> ppp b / src / qt / forms / modaloverlay . ui <nl> QLabel { color : rgb ( 40 , 40 , 40 ) ; } < / string > <nl> < customwidget > <nl> < class > ModalOverlay < / class > <nl> < extends > QWidget < / extends > <nl> - < header > modaloverlay . h < / header > <nl> + < header > qt / modaloverlay . h < / header > <nl> < container > 1 < / container > <nl> < / customwidget > <nl> < / customwidgets > <nl> mmm a / src / qt / forms / openuridialog . ui <nl> ppp b / src / qt / forms / openuridialog . ui <nl> <nl> < customwidget > <nl> < class > QValidatedLineEdit < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > qvalidatedlineedit . h < / header > <nl> + < header > qt / qvalidatedlineedit . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < resources / > <nl> mmm a / src / qt / forms / optionsdialog . ui <nl> ppp b / src / qt / forms / optionsdialog . ui <nl> <nl> < customwidget > <nl> < class > QValidatedLineEdit < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > qvalidatedlineedit . h < / header > <nl> + < header > qt / qvalidatedlineedit . h < / header > <nl> < / customwidget > <nl> < customwidget > <nl> < class > QValueComboBox < / class > <nl> < extends > QComboBox < / extends > <nl> - < header > qvaluecombobox . h < / header > <nl> + < header > qt / qvaluecombobox . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < resources / > <nl> mmm a / src / qt / forms / receivecoinsdialog . ui <nl> ppp b / src / qt / forms / receivecoinsdialog . ui <nl> <nl> < customwidget > <nl> < class > BitcoinAmountField < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > bitcoinamountfield . h < / header > <nl> + < header > qt / bitcoinamountfield . h < / header > <nl> < container > 1 < / container > <nl> < / customwidget > <nl> < / customwidgets > <nl> mmm a / src / qt / forms / receiverequestdialog . ui <nl> ppp b / src / qt / forms / receiverequestdialog . ui <nl> <nl> < customwidget > <nl> < class > QRImageWidget < / class > <nl> < extends > QLabel < / extends > <nl> - < header > receiverequestdialog . h < / header > <nl> + < header > qt / receiverequestdialog . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < resources / > <nl> mmm a / src / qt / forms / sendcoinsdialog . ui <nl> ppp b / src / qt / forms / sendcoinsdialog . ui <nl> <nl> < customwidget > <nl> < class > QValidatedLineEdit < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > qvalidatedlineedit . h < / header > <nl> + < header > qt / qvalidatedlineedit . h < / header > <nl> < / customwidget > <nl> < customwidget > <nl> < class > BitcoinAmountField < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > bitcoinamountfield . h < / header > <nl> + < header > qt / bitcoinamountfield . h < / header > <nl> < container > 1 < / container > <nl> < / customwidget > <nl> < / customwidgets > <nl> mmm a / src / qt / forms / sendcoinsentry . ui <nl> ppp b / src / qt / forms / sendcoinsentry . ui <nl> <nl> < customwidget > <nl> < class > QValidatedLineEdit < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > qvalidatedlineedit . h < / header > <nl> + < header > qt / qvalidatedlineedit . h < / header > <nl> < / customwidget > <nl> < customwidget > <nl> < class > BitcoinAmountField < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > bitcoinamountfield . h < / header > <nl> + < header > qt / bitcoinamountfield . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < tabstops > <nl> mmm a / src / qt / forms / signverifymessagedialog . ui <nl> ppp b / src / qt / forms / signverifymessagedialog . ui <nl> <nl> < customwidget > <nl> < class > QValidatedLineEdit < / class > <nl> < extends > QLineEdit < / extends > <nl> - < header > qvalidatedlineedit . h < / header > <nl> + < header > qt / qvalidatedlineedit . h < / header > <nl> < / customwidget > <nl> < / customwidgets > <nl> < resources > <nl>
|
qt : refactor : Use absolute include paths in . ui files
|
bitcoin/bitcoin
|
5b56ec969fcbedd87eb0cf43c16eb991aca300d0
|
2017-11-15T19:23:02Z
|
mmm a / doc / aria2c . 1 . asciidoc <nl> ppp b / doc / aria2c . 1 . asciidoc <nl> Advanced Options <nl> Possible Values : ' none ' , ' prealloc ' , ' falloc ' <nl> Default : ' prealloc ' <nl> <nl> + [ [ aria2_optref_hash_check_only ] ] * - - hash - check - only * [ = true | false ] : : <nl> + <nl> + If ' true ' is given , after hash check using <nl> + * < < aria2_optref_check_integrity , - - check - integrity > > * option , <nl> + abort download whether or not download is complete . <nl> + Default : ' false ' <nl> + <nl> [ [ aria2_optref_human_readable ] ] * - - human - readable * [ = ' true ' | ' false ' ] : : <nl> <nl> Print sizes and speed in human readable format ( e . g . , 1 . 2Ki , 3 . 4Mi ) <nl> of URIs . These optional lines must start with white space ( s ) . <nl> * * < < aria2_optref_metalink_base_uri , metalink - base - uri > > * <nl> * * < < aria2_optref_pause , pause > > * <nl> * * < < aria2_optref_stream_piece_selector , stream - piece - selector > > * <nl> + * * < < aria2_optref_hash_check_only , hash - check - only > > * <nl> <nl> These options have exactly same meaning of the ones in the <nl> command - line options , but it just applies to the URIs it belongs to . <nl>
|
Documented - - hash - check - only option in man page .
|
aria2/aria2
|
461d49d2d973275be00cef6599cb429828e1e2de
|
2011-08-22T14:37:37Z
|
mmm a / tensorflow / core / common_runtime / direct_session_with_tracking_alloc_test . cc <nl> ppp b / tensorflow / core / common_runtime / direct_session_with_tracking_alloc_test . cc <nl> TEST ( DirectSessionWithTrackingAllocTest , CostModelWithHardwareStats ) { <nl> TestHWAccelerator ( true ) ; <nl> } <nl> <nl> + TEST ( DirectSessionWithTrackingAllocTest , CostGraph ) { <nl> + EnableCPUAllocatorFullStats ( true ) ; <nl> + <nl> + Graph graph ( OpRegistry : : Global ( ) ) ; <nl> + <nl> + Tensor a_tensor ( DT_FLOAT , TensorShape ( { 2 , 2 } ) ) ; <nl> + test : : FillValues < float > ( & a_tensor , { 3 , 2 , - 1 , 0 } ) ; <nl> + Node * a = test : : graph : : Constant ( & graph , a_tensor ) ; <nl> + a - > set_assigned_device_name ( " / job : localhost / replica : 0 / task : 0 / cpu : 0 " ) ; <nl> + <nl> + Tensor x_tensor ( DT_FLOAT , TensorShape ( { 2 , 1 } ) ) ; <nl> + test : : FillValues < float > ( & x_tensor , { 1 , 1 } ) ; <nl> + Node * x = test : : graph : : Constant ( & graph , x_tensor ) ; <nl> + x - > set_assigned_device_name ( " / job : localhost / replica : 0 / task : 0 / cpu : 1 " ) ; <nl> + <nl> + / / y = A * x <nl> + Node * y = test : : graph : : Matmul ( & graph , a , x , false , false ) ; <nl> + y - > set_assigned_device_name ( " / job : localhost / replica : 0 / task : 0 / cpu : 0 " ) ; <nl> + <nl> + Node * y_neg = test : : graph : : Unary ( & graph , " Neg " , y ) ; <nl> + y_neg - > set_assigned_device_name ( " / job : localhost / replica : 0 / task : 0 / cpu : 1 " ) ; <nl> + <nl> + GraphDef def ; <nl> + test : : graph : : ToGraphDef ( & graph , & def ) ; <nl> + <nl> + SessionOptions options ; <nl> + ( * options . config . mutable_device_count ( ) ) [ " CPU " ] = 2 ; <nl> + options . config . mutable_graph_options ( ) - > set_build_cost_model ( true ) ; <nl> + options . config . mutable_graph_options ( ) <nl> + - > mutable_optimizer_options ( ) <nl> + - > set_opt_level ( OptimizerOptions : : L0 ) ; <nl> + std : : unique_ptr < Session > session ( NewSession ( options ) ) ; <nl> + TF_ASSERT_OK ( session - > Create ( def ) ) ; <nl> + std : : vector < std : : pair < string , Tensor > > inputs ; <nl> + <nl> + / / Request two targets : one fetch output and one non - fetched output . <nl> + RunOptions run_options ; <nl> + std : : vector < string > output_names = { y - > name ( ) + " : 0 " } ; <nl> + std : : vector < string > target_nodes = { y_neg - > name ( ) } ; <nl> + std : : vector < Tensor > outputs ; <nl> + RunMetadata run_metadata ; <nl> + const int64 start_micros = Env : : Default ( ) - > NowMicros ( ) ; <nl> + Status s = session - > Run ( run_options , inputs , output_names , target_nodes , <nl> + & outputs , & run_metadata ) ; <nl> + const int64 run_duration_micros = Env : : Default ( ) - > NowMicros ( ) - start_micros ; <nl> + TF_ASSERT_OK ( s ) ; <nl> + <nl> + EXPECT_LE ( 2 , run_metadata . cost_graph ( ) . node_size ( ) ) ; <nl> + for ( const auto & node : run_metadata . cost_graph ( ) . node ( ) ) { <nl> + if ( node . name ( ) = = y - > name ( ) | | node . name ( ) = = y_neg - > name ( ) ) { <nl> + EXPECT_EQ ( 1 , node . output_info_size ( ) ) ; <nl> + EXPECT_LE ( 8 , node . output_info ( 0 ) . size ( ) ) ; <nl> + const TensorShapeProto & shape = node . output_info ( 0 ) . shape ( ) ; <nl> + EXPECT_EQ ( 2 , shape . dim_size ( ) ) ; <nl> + EXPECT_EQ ( 2 , shape . dim ( 0 ) . size ( ) ) ; <nl> + EXPECT_EQ ( 1 , shape . dim ( 1 ) . size ( ) ) ; <nl> + } <nl> + EXPECT_LE ( 0 , node . compute_cost ( ) ) ; <nl> + EXPECT_GE ( run_duration_micros , node . compute_cost ( ) ) ; <nl> + } <nl> + } <nl> + <nl> } / / namespace <nl> } / / namespace tensorflow <nl>
|
Added a test to validate that the cost graph is properly exported from direct
|
tensorflow/tensorflow
|
7ba74d62d7b3c4f9aa5242d061b169d703fa220d
|
2016-10-10T23:18:39Z
|
mmm a / thirdparty / README . md <nl> ppp b / thirdparty / README . md <nl> Use UI font variant if available , because it has tight vertical metrics and good <nl> # # freetype <nl> <nl> - Upstream : https : / / www . freetype . org <nl> - - Version : 2 . 10 . 2 ( 2020 ) <nl> + - Version : 2 . 10 . 4 ( 2020 ) <nl> - License : FreeType License ( BSD - like ) <nl> <nl> Files extracted from upstream source : <nl> mmm a / thirdparty / freetype / include / freetype / config / ftconfig . h <nl> ppp b / thirdparty / freetype / include / freetype / config / ftconfig . h <nl> <nl> # include FT_CONFIG_OPTIONS_H <nl> # include FT_CONFIG_STANDARD_LIBRARY_H <nl> <nl> - <nl> - FT_BEGIN_HEADER <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * PLATFORM - SPECIFIC CONFIGURATION MACROS <nl> - * <nl> - * These macros can be toggled to suit a specific system . The current ones <nl> - * are defaults used to compile FreeType in an ANSI C environment ( 16bit <nl> - * compilers are also supported ) . Copy this file to your own <nl> - * ` builds / < system > ` directory , and edit it to port the engine . <nl> - * <nl> - * / <nl> - <nl> - <nl> - / * There are systems ( like the Texas Instruments ' C54x ) where a ` char ` * / <nl> - / * has 16 ~ bits . ANSI ~ C says that ` sizeof ( char ) ` is always ~ 1 . Since an * / <nl> - / * ` int ` has 16 ~ bits also for this system , ` sizeof ( int ) ` gives ~ 1 which * / <nl> - / * is probably unexpected . * / <nl> - / * * / <nl> - / * ` CHAR_BIT ` ( defined in ` limits . h ` ) gives the number of bits in a * / <nl> - / * ` char ` type . * / <nl> - <nl> - # ifndef FT_CHAR_BIT <nl> - # define FT_CHAR_BIT CHAR_BIT <nl> - # endif <nl> - <nl> - <nl> - / * The size of an ` int ` type . * / <nl> - # if FT_UINT_MAX = = 0xFFFFUL <nl> - # define FT_SIZEOF_INT ( 16 / FT_CHAR_BIT ) <nl> - # elif FT_UINT_MAX = = 0xFFFFFFFFUL <nl> - # define FT_SIZEOF_INT ( 32 / FT_CHAR_BIT ) <nl> - # elif FT_UINT_MAX > 0xFFFFFFFFUL & & FT_UINT_MAX = = 0xFFFFFFFFFFFFFFFFUL <nl> - # define FT_SIZEOF_INT ( 64 / FT_CHAR_BIT ) <nl> - # else <nl> - # error " Unsupported size of ` int ' type ! " <nl> - # endif <nl> - <nl> - / * The size of a ` long ` type . A five - byte ` long ` ( as used e . g . on the * / <nl> - / * DM642 ) is recognized but avoided . * / <nl> - # if FT_ULONG_MAX = = 0xFFFFFFFFUL <nl> - # define FT_SIZEOF_LONG ( 32 / FT_CHAR_BIT ) <nl> - # elif FT_ULONG_MAX > 0xFFFFFFFFUL & & FT_ULONG_MAX = = 0xFFFFFFFFFFUL <nl> - # define FT_SIZEOF_LONG ( 32 / FT_CHAR_BIT ) <nl> - # elif FT_ULONG_MAX > 0xFFFFFFFFUL & & FT_ULONG_MAX = = 0xFFFFFFFFFFFFFFFFUL <nl> - # define FT_SIZEOF_LONG ( 64 / FT_CHAR_BIT ) <nl> - # else <nl> - # error " Unsupported size of ` long ' type ! " <nl> - # endif <nl> - <nl> - <nl> - / * ` FT_UNUSED ` indicates that a given parameter is not used - - * / <nl> - / * this is only used to get rid of unpleasant compiler warnings . * / <nl> - # ifndef FT_UNUSED <nl> - # define FT_UNUSED ( arg ) ( ( arg ) = ( arg ) ) <nl> - # endif <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * AUTOMATIC CONFIGURATION MACROS <nl> - * <nl> - * These macros are computed from the ones defined above . Don ' t touch <nl> - * their definition , unless you know precisely what you are doing . No <nl> - * porter should need to mess with them . <nl> - * <nl> - * / <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * Mac support <nl> - * <nl> - * This is the only necessary change , so it is defined here instead <nl> - * providing a new configuration file . <nl> - * / <nl> - # if defined ( __APPLE__ ) | | ( defined ( __MWERKS__ ) & & defined ( macintosh ) ) <nl> - / * No Carbon frameworks for 64bit 10 . 4 . x . * / <nl> - / * ` AvailabilityMacros . h ` is available since Mac OS X 10 . 2 , * / <nl> - / * so guess the system version by maximum errno before inclusion . * / <nl> - # include < errno . h > <nl> - # ifdef ECANCELED / * defined since 10 . 2 * / <nl> - # include " AvailabilityMacros . h " <nl> - # endif <nl> - # if defined ( __LP64__ ) & & \ <nl> - ( MAC_OS_X_VERSION_MIN_REQUIRED < = MAC_OS_X_VERSION_10_4 ) <nl> - # undef FT_MACINTOSH <nl> - # endif <nl> - <nl> - # elif defined ( __SC__ ) | | defined ( __MRC__ ) <nl> - / * Classic MacOS compilers * / <nl> - # include " ConditionalMacros . h " <nl> - # if TARGET_OS_MAC <nl> - # define FT_MACINTOSH 1 <nl> - # endif <nl> - <nl> - # endif <nl> - <nl> - <nl> - / * Fix compiler warning with sgi compiler . * / <nl> - # if defined ( __sgi ) & & ! defined ( __GNUC__ ) <nl> - # if defined ( _COMPILER_VERSION ) & & ( _COMPILER_VERSION > = 730 ) <nl> - # pragma set woff 3505 <nl> - # endif <nl> - # endif <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ section : <nl> - * basic_types <nl> - * <nl> - * / <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ type : <nl> - * FT_Int16 <nl> - * <nl> - * @ description : <nl> - * A typedef for a 16bit signed integer type . <nl> - * / <nl> - typedef signed short FT_Int16 ; <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ type : <nl> - * FT_UInt16 <nl> - * <nl> - * @ description : <nl> - * A typedef for a 16bit unsigned integer type . <nl> - * / <nl> - typedef unsigned short FT_UInt16 ; <nl> - <nl> - / * * / <nl> - <nl> - <nl> - / * this # if 0 . . . # endif clause is for documentation purposes * / <nl> - # if 0 <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ type : <nl> - * FT_Int32 <nl> - * <nl> - * @ description : <nl> - * A typedef for a 32bit signed integer type . The size depends on the <nl> - * configuration . <nl> - * / <nl> - typedef signed XXX FT_Int32 ; <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ type : <nl> - * FT_UInt32 <nl> - * <nl> - * A typedef for a 32bit unsigned integer type . The size depends on the <nl> - * configuration . <nl> - * / <nl> - typedef unsigned XXX FT_UInt32 ; <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ type : <nl> - * FT_Int64 <nl> - * <nl> - * A typedef for a 64bit signed integer type . The size depends on the <nl> - * configuration . Only defined if there is real 64bit support ; <nl> - * otherwise , it gets emulated with a structure ( if necessary ) . <nl> - * / <nl> - typedef signed XXX FT_Int64 ; <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * @ type : <nl> - * FT_UInt64 <nl> - * <nl> - * A typedef for a 64bit unsigned integer type . The size depends on the <nl> - * configuration . Only defined if there is real 64bit support ; <nl> - * otherwise , it gets emulated with a structure ( if necessary ) . <nl> - * / <nl> - typedef unsigned XXX FT_UInt64 ; <nl> - <nl> - / * * / <nl> - <nl> - # endif <nl> - <nl> - # if FT_SIZEOF_INT = = ( 32 / FT_CHAR_BIT ) <nl> - <nl> - typedef signed int FT_Int32 ; <nl> - typedef unsigned int FT_UInt32 ; <nl> - <nl> - # elif FT_SIZEOF_LONG = = ( 32 / FT_CHAR_BIT ) <nl> - <nl> - typedef signed long FT_Int32 ; <nl> - typedef unsigned long FT_UInt32 ; <nl> - <nl> - # else <nl> - # error " no 32bit type found - - please check your configuration files " <nl> - # endif <nl> - <nl> - <nl> - / * look up an integer type that is at least 32 ~ bits * / <nl> - # if FT_SIZEOF_INT > = ( 32 / FT_CHAR_BIT ) <nl> - <nl> - typedef int FT_Fast ; <nl> - typedef unsigned int FT_UFast ; <nl> - <nl> - # elif FT_SIZEOF_LONG > = ( 32 / FT_CHAR_BIT ) <nl> - <nl> - typedef long FT_Fast ; <nl> - typedef unsigned long FT_UFast ; <nl> - <nl> - # endif <nl> - <nl> - <nl> - / * determine whether we have a 64 - bit ` int ` type for platforms without * / <nl> - / * Autoconf * / <nl> - # if FT_SIZEOF_LONG = = ( 64 / FT_CHAR_BIT ) <nl> - <nl> - / * ` FT_LONG64 ` must be defined if a 64 - bit type is available * / <nl> - # define FT_LONG64 <nl> - # define FT_INT64 long <nl> - # define FT_UINT64 unsigned long <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * A 64 - bit data type may create compilation problems if you compile in <nl> - * strict ANSI mode . To avoid them , we disable other 64 - bit data types if <nl> - * ` __STDC__ ` is defined . You can however ignore this rule by defining the <nl> - * ` FT_CONFIG_OPTION_FORCE_INT64 ` configuration macro . <nl> - * / <nl> - # elif ! defined ( __STDC__ ) | | defined ( FT_CONFIG_OPTION_FORCE_INT64 ) <nl> - <nl> - # if defined ( __STDC_VERSION__ ) & & __STDC_VERSION__ > = 199901L <nl> - <nl> - # define FT_LONG64 <nl> - # define FT_INT64 long long int <nl> - # define FT_UINT64 unsigned long long int <nl> - <nl> - # elif defined ( _MSC_VER ) & & _MSC_VER > = 900 / * Visual C + + ( and Intel C + + ) * / <nl> - <nl> - / * this compiler provides the ` __int64 ` type * / <nl> - # define FT_LONG64 <nl> - # define FT_INT64 __int64 <nl> - # define FT_UINT64 unsigned __int64 <nl> - <nl> - # elif defined ( __BORLANDC__ ) / * Borland C + + * / <nl> - <nl> - / * XXXX : We should probably check the value of ` __BORLANDC__ ` in order * / <nl> - / * to test the compiler version . * / <nl> - <nl> - / * this compiler provides the ` __int64 ` type * / <nl> - # define FT_LONG64 <nl> - # define FT_INT64 __int64 <nl> - # define FT_UINT64 unsigned __int64 <nl> - <nl> - # elif defined ( __WATCOMC__ ) / * Watcom C + + * / <nl> - <nl> - / * Watcom doesn ' t provide 64 - bit data types * / <nl> - <nl> - # elif defined ( __MWERKS__ ) / * Metrowerks CodeWarrior * / <nl> - <nl> - # define FT_LONG64 <nl> - # define FT_INT64 long long int <nl> - # define FT_UINT64 unsigned long long int <nl> - <nl> - # elif defined ( __GNUC__ ) <nl> - <nl> - / * GCC provides the ` long long ` type * / <nl> - # define FT_LONG64 <nl> - # define FT_INT64 long long int <nl> - # define FT_UINT64 unsigned long long int <nl> - <nl> - # endif / * __STDC_VERSION__ > = 199901L * / <nl> - <nl> - # endif / * FT_SIZEOF_LONG = = ( 64 / FT_CHAR_BIT ) * / <nl> - <nl> - # ifdef FT_LONG64 <nl> - typedef FT_INT64 FT_Int64 ; <nl> - typedef FT_UINT64 FT_UInt64 ; <nl> - # endif <nl> - <nl> - <nl> - # ifdef _WIN64 <nl> - / * only 64bit Windows uses the LLP64 data model , i . e . , * / <nl> - / * 32bit integers , 64bit pointers * / <nl> - # define FT_UINT_TO_POINTER ( x ) ( void * ) ( unsigned __int64 ) ( x ) <nl> - # else <nl> - # define FT_UINT_TO_POINTER ( x ) ( void * ) ( unsigned long ) ( x ) <nl> - # endif <nl> - <nl> - <nl> - / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> - * <nl> - * miscellaneous <nl> - * <nl> - * / <nl> - <nl> - <nl> - # define FT_BEGIN_STMNT do { <nl> - # define FT_END_STMNT } while ( 0 ) <nl> - # define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT <nl> - <nl> - <nl> - / * ` typeof ` condition taken from gnulib ' s ` intprops . h ` header file * / <nl> - # if ( ( defined ( __GNUC__ ) & & __GNUC__ > = 2 ) | | \ <nl> - ( defined ( __IBMC__ ) & & __IBMC__ > = 1210 & & \ <nl> - defined ( __IBM__TYPEOF__ ) ) | | \ <nl> - ( defined ( __SUNPRO_C ) & & __SUNPRO_C > = 0x5110 & & ! __STDC__ ) ) <nl> - # define FT_TYPEOF ( type ) ( __typeof__ ( type ) ) <nl> - # else <nl> - # define FT_TYPEOF ( type ) / * empty * / <nl> - # endif <nl> - <nl> - <nl> - / * Use ` FT_LOCAL ` and ` FT_LOCAL_DEF ` to declare and define , * / <nl> - / * respectively , a function that gets used only within the scope of a * / <nl> - / * module . Normally , both the header and source code files for such a * / <nl> - / * function are within a single module directory . * / <nl> - / * * / <nl> - / * Intra - module arrays should be tagged with ` FT_LOCAL_ARRAY ` and * / <nl> - / * ` FT_LOCAL_ARRAY_DEF ` . * / <nl> - / * * / <nl> - # ifdef FT_MAKE_OPTION_SINGLE_OBJECT <nl> - <nl> - # define FT_LOCAL ( x ) static x <nl> - # define FT_LOCAL_DEF ( x ) static x <nl> - <nl> - # else <nl> - <nl> - # ifdef __cplusplus <nl> - # define FT_LOCAL ( x ) extern " C " x <nl> - # define FT_LOCAL_DEF ( x ) extern " C " x <nl> - # else <nl> - # define FT_LOCAL ( x ) extern x <nl> - # define FT_LOCAL_DEF ( x ) x <nl> - # endif <nl> - <nl> - # endif / * FT_MAKE_OPTION_SINGLE_OBJECT * / <nl> - <nl> - # define FT_LOCAL_ARRAY ( x ) extern const x <nl> - # define FT_LOCAL_ARRAY_DEF ( x ) const x <nl> - <nl> - <nl> - / * Use ` FT_BASE ` and ` FT_BASE_DEF ` to declare and define , respectively , * / <nl> - / * functions that are used in more than a single module . In the * / <nl> - / * current setup this implies that the declaration is in a header file * / <nl> - / * in the ` include / freetype / internal ` directory , and the function body * / <nl> - / * is in a file in ` src / base ` . * / <nl> - / * * / <nl> - # ifndef FT_BASE <nl> - <nl> - # ifdef __cplusplus <nl> - # define FT_BASE ( x ) extern " C " x <nl> - # else <nl> - # define FT_BASE ( x ) extern x <nl> - # endif <nl> - <nl> - # endif / * ! FT_BASE * / <nl> - <nl> - <nl> - # ifndef FT_BASE_DEF <nl> - <nl> - # ifdef __cplusplus <nl> - # define FT_BASE_DEF ( x ) x <nl> - # else <nl> - # define FT_BASE_DEF ( x ) x <nl> - # endif <nl> - <nl> - # endif / * ! FT_BASE_DEF * / <nl> - <nl> - <nl> - / * When compiling FreeType as a DLL or DSO with hidden visibility * / <nl> - / * some systems / compilers need a special attribute in front OR after * / <nl> - / * the return type of function declarations . * / <nl> - / * * / <nl> - / * Two macros are used within the FreeType source code to define * / <nl> - / * exported library functions : ` FT_EXPORT ` and ` FT_EXPORT_DEF ` . * / <nl> - / * * / <nl> - / * - ` FT_EXPORT ( return_type ) ` * / <nl> - / * * / <nl> - / * is used in a function declaration , as in * / <nl> - / * * / <nl> - / * ` ` ` * / <nl> - / * FT_EXPORT ( FT_Error ) * / <nl> - / * FT_Init_FreeType ( FT_Library * alibrary ) ; * / <nl> - / * ` ` ` * / <nl> - / * * / <nl> - / * - ` FT_EXPORT_DEF ( return_type ) ` * / <nl> - / * * / <nl> - / * is used in a function definition , as in * / <nl> - / * * / <nl> - / * ` ` ` * / <nl> - / * FT_EXPORT_DEF ( FT_Error ) * / <nl> - / * FT_Init_FreeType ( FT_Library * alibrary ) * / <nl> - / * { * / <nl> - / * . . . some code . . . * / <nl> - / * return FT_Err_Ok ; * / <nl> - / * } * / <nl> - / * ` ` ` * / <nl> - / * * / <nl> - / * You can provide your own implementation of ` FT_EXPORT ` and * / <nl> - / * ` FT_EXPORT_DEF ` here if you want . * / <nl> - / * * / <nl> - / * To export a variable , use ` FT_EXPORT_VAR ` . * / <nl> - / * * / <nl> - # ifndef FT_EXPORT <nl> - <nl> - # ifdef FT2_BUILD_LIBRARY <nl> - <nl> - # if defined ( _WIN32 ) & & defined ( DLL_EXPORT ) <nl> - # define FT_EXPORT ( x ) __declspec ( dllexport ) x <nl> - # elif defined ( __GNUC__ ) & & __GNUC__ > = 4 <nl> - # define FT_EXPORT ( x ) __attribute__ ( ( visibility ( " default " ) ) ) x <nl> - # elif defined ( __SUNPRO_C ) & & __SUNPRO_C > = 0x550 <nl> - # define FT_EXPORT ( x ) __global x <nl> - # elif defined ( __cplusplus ) <nl> - # define FT_EXPORT ( x ) extern " C " x <nl> - # else <nl> - # define FT_EXPORT ( x ) extern x <nl> - # endif <nl> - <nl> - # else <nl> - <nl> - # if defined ( _WIN32 ) & & defined ( DLL_IMPORT ) <nl> - # define FT_EXPORT ( x ) __declspec ( dllimport ) x <nl> - # elif defined ( __cplusplus ) <nl> - # define FT_EXPORT ( x ) extern " C " x <nl> - # else <nl> - # define FT_EXPORT ( x ) extern x <nl> - # endif <nl> - <nl> - # endif <nl> - <nl> - # endif / * ! FT_EXPORT * / <nl> - <nl> - <nl> - # ifndef FT_EXPORT_DEF <nl> - <nl> - # ifdef __cplusplus <nl> - # define FT_EXPORT_DEF ( x ) extern " C " x <nl> - # else <nl> - # define FT_EXPORT_DEF ( x ) extern x <nl> - # endif <nl> - <nl> - # endif / * ! FT_EXPORT_DEF * / <nl> - <nl> - <nl> - # ifndef FT_EXPORT_VAR <nl> - <nl> - # ifdef __cplusplus <nl> - # define FT_EXPORT_VAR ( x ) extern " C " x <nl> - # else <nl> - # define FT_EXPORT_VAR ( x ) extern x <nl> - # endif <nl> - <nl> - # endif / * ! FT_EXPORT_VAR * / <nl> - <nl> - <nl> - / * The following macros are needed to compile the library with a * / <nl> - / * C + + compiler and with 16bit compilers . * / <nl> - / * * / <nl> - <nl> - / * This is special . Within C + + , you must specify ` extern " C " ` for * / <nl> - / * functions which are used via function pointers , and you also * / <nl> - / * must do that for structures which contain function pointers to * / <nl> - / * assure C linkage - - it ' s not possible to have ( local ) anonymous * / <nl> - / * functions which are accessed by ( global ) function pointers . * / <nl> - / * * / <nl> - / * * / <nl> - / * FT_CALLBACK_DEF is used to _define_ a callback function , * / <nl> - / * located in the same source code file as the structure that uses * / <nl> - / * it . * / <nl> - / * * / <nl> - / * FT_BASE_CALLBACK and FT_BASE_CALLBACK_DEF are used to declare * / <nl> - / * and define a callback function , respectively , in a similar way * / <nl> - / * as FT_BASE and FT_BASE_DEF work . * / <nl> - / * * / <nl> - / * FT_CALLBACK_TABLE is used to _declare_ a constant variable that * / <nl> - / * contains pointers to callback functions . * / <nl> - / * * / <nl> - / * FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable * / <nl> - / * that contains pointers to callback functions . * / <nl> - / * * / <nl> - / * * / <nl> - / * Some 16bit compilers have to redefine these macros to insert * / <nl> - / * the infamous ` _cdecl ` or ` __fastcall ` declarations . * / <nl> - / * * / <nl> - # ifndef FT_CALLBACK_DEF <nl> - # ifdef __cplusplus <nl> - # define FT_CALLBACK_DEF ( x ) extern " C " x <nl> - # else <nl> - # define FT_CALLBACK_DEF ( x ) static x <nl> - # endif <nl> - # endif / * FT_CALLBACK_DEF * / <nl> - <nl> - # ifndef FT_BASE_CALLBACK <nl> - # ifdef __cplusplus <nl> - # define FT_BASE_CALLBACK ( x ) extern " C " x <nl> - # define FT_BASE_CALLBACK_DEF ( x ) extern " C " x <nl> - # else <nl> - # define FT_BASE_CALLBACK ( x ) extern x <nl> - # define FT_BASE_CALLBACK_DEF ( x ) x <nl> - # endif <nl> - # endif / * FT_BASE_CALLBACK * / <nl> - <nl> - # ifndef FT_CALLBACK_TABLE <nl> - # ifdef __cplusplus <nl> - # define FT_CALLBACK_TABLE extern " C " <nl> - # define FT_CALLBACK_TABLE_DEF extern " C " <nl> - # else <nl> - # define FT_CALLBACK_TABLE extern <nl> - # define FT_CALLBACK_TABLE_DEF / * nothing * / <nl> - # endif <nl> - # endif / * FT_CALLBACK_TABLE * / <nl> - <nl> - <nl> - FT_END_HEADER <nl> - <nl> + # include < freetype / config / integer - types . h > <nl> + # include < freetype / config / public - macros . h > <nl> + # include < freetype / config / mac - support . h > <nl> <nl> # endif / * FTCONFIG_H_ * / <nl> <nl> mmm a / thirdparty / freetype / include / freetype / config / ftheader . h <nl> ppp b / thirdparty / freetype / include / freetype / config / ftheader . h <nl> <nl> / * encapsulated in an ` extern " C " { . . } ` block when included from a * / <nl> / * C + + compiler . * / <nl> / * * / <nl> - # ifdef __cplusplus <nl> - # define FT_BEGIN_HEADER extern " C " { <nl> - # else <nl> - # define FT_BEGIN_HEADER / * nothing * / <nl> + # ifndef FT_BEGIN_HEADER <nl> + # ifdef __cplusplus <nl> + # define FT_BEGIN_HEADER extern " C " { <nl> + # else <nl> + # define FT_BEGIN_HEADER / * nothing * / <nl> + # endif <nl> # endif <nl> <nl> <nl> <nl> / * encapsulated in an ` extern " C " { . . } ` block when included from a * / <nl> / * C + + compiler . * / <nl> / * * / <nl> - # ifdef __cplusplus <nl> - # define FT_END_HEADER } <nl> - # else <nl> - # define FT_END_HEADER / * nothing * / <nl> + # ifndef FT_END_HEADER <nl> + # ifdef __cplusplus <nl> + # define FT_END_HEADER } <nl> + # else <nl> + # define FT_END_HEADER / * nothing * / <nl> + # endif <nl> # endif <nl> <nl> <nl> <nl> * Macro definitions used to ` # include ` specific header files . <nl> * <nl> * @ description : <nl> - * The following macros are defined to the name of specific FreeType ~ 2 <nl> - * header files . They can be used directly in ` # include ` statements as <nl> - * in : <nl> + * In addition to the normal scheme of including header files like <nl> + * <nl> + * ` ` ` <nl> + * # include < freetype / freetype . h > <nl> + * # include < freetype / ftmm . h > <nl> + * # include < freetype / ftglyph . h > <nl> + * ` ` ` <nl> + * <nl> + * it is possible to used named macros instead . They can be used <nl> + * directly in ` # include ` statements as in <nl> * <nl> * ` ` ` <nl> * # include FT_FREETYPE_H <nl> <nl> * # include FT_GLYPH_H <nl> * ` ` ` <nl> * <nl> - * There are several reasons why we are now using macros to name public <nl> - * header files . The first one is that such macros are not limited to <nl> - * the infamous 8 . 3 ~ naming rule required by DOS ( and <nl> - * ` FT_MULTIPLE_MASTERS_H ` is a lot more meaningful than ` ftmm . h ` ) . <nl> - * <nl> - * The second reason is that it allows for more flexibility in the way <nl> - * FreeType ~ 2 is installed on a given system . <nl> + * These macros were introduced to overcome the infamous 8 . 3 ~ naming rule <nl> + * required by DOS ( and ` FT_MULTIPLE_MASTERS_H ` is a lot more meaningful <nl> + * than ` ftmm . h ` ) . <nl> * <nl> * / <nl> <nl> <nl> # define FT_CACHE_INTERNAL_IMAGE_H FT_CACHE_H <nl> # define FT_CACHE_INTERNAL_SBITS_H FT_CACHE_H <nl> <nl> - <nl> - / * <nl> - * Include internal headers definitions from ` < internal / . . . > ` only when <nl> - * building the library . <nl> - * / <nl> + / * TODO ( david ) : Move this section below to a different header * / <nl> # ifdef FT2_BUILD_LIBRARY <nl> - # define FT_INTERNAL_INTERNAL_H < freetype / internal / internal . h > <nl> - # include FT_INTERNAL_INTERNAL_H <nl> - # endif / * FT2_BUILD_LIBRARY * / <nl> + # if defined ( _MSC_VER ) / * Visual C + + ( and Intel C + + ) * / <nl> <nl> + / * We disable the warning ` conditional expression is constant ' here * / <nl> + / * in order to compile cleanly with the maximum level of warnings . * / <nl> + / * In particular , the warning complains about stuff like ` while ( 0 ) ' * / <nl> + / * which is very useful in macro definitions . There is no benefit * / <nl> + / * in having it enabled . * / <nl> + # pragma warning ( disable : 4127 ) <nl> + <nl> + # endif / * _MSC_VER * / <nl> + # endif / * FT2_BUILD_LIBRARY * / <nl> <nl> # endif / * FTHEADER_H_ * / <nl> <nl> mmm a / thirdparty / freetype / include / freetype / config / ftmodule . h <nl> ppp b / thirdparty / freetype / include / freetype / config / ftmodule . h <nl> FT_USE_MODULE ( FT_Module_Class , pshinter_module_class ) <nl> FT_USE_MODULE ( FT_Renderer_Class , ft_raster1_renderer_class ) <nl> FT_USE_MODULE ( FT_Module_Class , sfnt_module_class ) <nl> FT_USE_MODULE ( FT_Renderer_Class , ft_smooth_renderer_class ) <nl> - FT_USE_MODULE ( FT_Renderer_Class , ft_smooth_lcd_renderer_class ) <nl> - FT_USE_MODULE ( FT_Renderer_Class , ft_smooth_lcdv_renderer_class ) <nl> FT_USE_MODULE ( FT_Driver_ClassRec , bdf_driver_class ) <nl> <nl> / * EOF * / <nl> mmm a / thirdparty / freetype / include / freetype / config / ftoption . h <nl> ppp b / thirdparty / freetype / include / freetype / config / ftoption . h <nl> FT_BEGIN_HEADER <nl> * the name of a directory that is included _before_ the FreeType include <nl> * path during compilation . <nl> * <nl> - * The default FreeType Makefiles and Jamfiles use the build directory <nl> + * The default FreeType Makefiles use the build directory <nl> * ` builds / < system > ` by default , but you can easily change that for your <nl> * own projects . <nl> * <nl> FT_BEGIN_HEADER <nl> * mitigate color fringes inherent to this technology , you also need to <nl> * explicitly set up LCD filtering . <nl> * <nl> - * Note that this feature is covered by several Microsoft patents and <nl> - * should not be activated in any default build of the library . When this <nl> - * macro is not defined , FreeType offers alternative LCD rendering <nl> - * technology that produces excellent output without LCD filtering . <nl> + * When this macro is not defined , FreeType offers alternative LCD <nl> + * rendering technology that produces excellent output . <nl> * / <nl> / * # define FT_CONFIG_OPTION_SUBPIXEL_RENDERING * / <nl> <nl> FT_BEGIN_HEADER <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> * <nl> - * Define ` TT_CONFIG_OPTION_COLOR_LAYERS ` if you want to support coloured <nl> + * Define ` TT_CONFIG_OPTION_COLOR_LAYERS ` if you want to support colored <nl> * outlines ( from the ' COLR ' / ' CPAL ' tables ) in all formats using the ' sfnt ' <nl> * module ( namely TrueType ~ & OpenType ) . <nl> * / <nl> new file mode 100644 <nl> index 00000000000 . . a0ca0c95e21 <nl> mmm / dev / null <nl> ppp b / thirdparty / freetype / include / freetype / config / integer - types . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * config / integer - types . h <nl> + * <nl> + * FreeType integer types definitions . <nl> + * <nl> + * Copyright ( C ) 1996 - 2020 by <nl> + * David Turner , Robert Wilhelm , and Werner Lemberg . <nl> + * <nl> + * This file is part of the FreeType project , and may only be used , <nl> + * modified , and distributed under the terms of the FreeType project <nl> + * license , LICENSE . TXT . By continuing to use , modify , or distribute <nl> + * this file you indicate that you have read the license and <nl> + * understand and accept it fully . <nl> + * <nl> + * / <nl> + # ifndef FREETYPE_CONFIG_INTEGER_TYPES_H_ <nl> + # define FREETYPE_CONFIG_INTEGER_TYPES_H_ <nl> + <nl> + / * There are systems ( like the Texas Instruments ' C54x ) where a ` char ` * / <nl> + / * has 16 ~ bits . ANSI ~ C says that ` sizeof ( char ) ` is always ~ 1 . Since an * / <nl> + / * ` int ` has 16 ~ bits also for this system , ` sizeof ( int ) ` gives ~ 1 which * / <nl> + / * is probably unexpected . * / <nl> + / * * / <nl> + / * ` CHAR_BIT ` ( defined in ` limits . h ` ) gives the number of bits in a * / <nl> + / * ` char ` type . * / <nl> + <nl> + # ifndef FT_CHAR_BIT <nl> + # define FT_CHAR_BIT CHAR_BIT <nl> + # endif <nl> + <nl> + # ifndef FT_SIZEOF_INT <nl> + <nl> + / * The size of an ` int ` type . * / <nl> + # if FT_UINT_MAX = = 0xFFFFUL <nl> + # define FT_SIZEOF_INT ( 16 / FT_CHAR_BIT ) <nl> + # elif FT_UINT_MAX = = 0xFFFFFFFFUL <nl> + # define FT_SIZEOF_INT ( 32 / FT_CHAR_BIT ) <nl> + # elif FT_UINT_MAX > 0xFFFFFFFFUL & & FT_UINT_MAX = = 0xFFFFFFFFFFFFFFFFUL <nl> + # define FT_SIZEOF_INT ( 64 / FT_CHAR_BIT ) <nl> + # else <nl> + # error " Unsupported size of ` int ' type ! " <nl> + # endif <nl> + <nl> + # endif / * ! defined ( FT_SIZEOF_INT ) * / <nl> + <nl> + # ifndef FT_SIZEOF_LONG <nl> + <nl> + / * The size of a ` long ` type . A five - byte ` long ` ( as used e . g . on the * / <nl> + / * DM642 ) is recognized but avoided . * / <nl> + # if FT_ULONG_MAX = = 0xFFFFFFFFUL <nl> + # define FT_SIZEOF_LONG ( 32 / FT_CHAR_BIT ) <nl> + # elif FT_ULONG_MAX > 0xFFFFFFFFUL & & FT_ULONG_MAX = = 0xFFFFFFFFFFUL <nl> + # define FT_SIZEOF_LONG ( 32 / FT_CHAR_BIT ) <nl> + # elif FT_ULONG_MAX > 0xFFFFFFFFUL & & FT_ULONG_MAX = = 0xFFFFFFFFFFFFFFFFUL <nl> + # define FT_SIZEOF_LONG ( 64 / FT_CHAR_BIT ) <nl> + # else <nl> + # error " Unsupported size of ` long ' type ! " <nl> + # endif <nl> + <nl> + # endif / * ! defined ( FT_SIZEOF_LONG ) * / <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ section : <nl> + * basic_types <nl> + * <nl> + * / <nl> + <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ type : <nl> + * FT_Int16 <nl> + * <nl> + * @ description : <nl> + * A typedef for a 16bit signed integer type . <nl> + * / <nl> + typedef signed short FT_Int16 ; <nl> + <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ type : <nl> + * FT_UInt16 <nl> + * <nl> + * @ description : <nl> + * A typedef for a 16bit unsigned integer type . <nl> + * / <nl> + typedef unsigned short FT_UInt16 ; <nl> + <nl> + / * * / <nl> + <nl> + <nl> + / * this # if 0 . . . # endif clause is for documentation purposes * / <nl> + # if 0 <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ type : <nl> + * FT_Int32 <nl> + * <nl> + * @ description : <nl> + * A typedef for a 32bit signed integer type . The size depends on the <nl> + * configuration . <nl> + * / <nl> + typedef signed XXX FT_Int32 ; <nl> + <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ type : <nl> + * FT_UInt32 <nl> + * <nl> + * A typedef for a 32bit unsigned integer type . The size depends on the <nl> + * configuration . <nl> + * / <nl> + typedef unsigned XXX FT_UInt32 ; <nl> + <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ type : <nl> + * FT_Int64 <nl> + * <nl> + * A typedef for a 64bit signed integer type . The size depends on the <nl> + * configuration . Only defined if there is real 64bit support ; <nl> + * otherwise , it gets emulated with a structure ( if necessary ) . <nl> + * / <nl> + typedef signed XXX FT_Int64 ; <nl> + <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * @ type : <nl> + * FT_UInt64 <nl> + * <nl> + * A typedef for a 64bit unsigned integer type . The size depends on the <nl> + * configuration . Only defined if there is real 64bit support ; <nl> + * otherwise , it gets emulated with a structure ( if necessary ) . <nl> + * / <nl> + typedef unsigned XXX FT_UInt64 ; <nl> + <nl> + / * * / <nl> + <nl> + # endif <nl> + <nl> + # if FT_SIZEOF_INT = = ( 32 / FT_CHAR_BIT ) <nl> + <nl> + typedef signed int FT_Int32 ; <nl> + typedef unsigned int FT_UInt32 ; <nl> + <nl> + # elif FT_SIZEOF_LONG = = ( 32 / FT_CHAR_BIT ) <nl> + <nl> + typedef signed long FT_Int32 ; <nl> + typedef unsigned long FT_UInt32 ; <nl> + <nl> + # else <nl> + # error " no 32bit type found - - please check your configuration files " <nl> + # endif <nl> + <nl> + <nl> + / * look up an integer type that is at least 32 ~ bits * / <nl> + # if FT_SIZEOF_INT > = ( 32 / FT_CHAR_BIT ) <nl> + <nl> + typedef int FT_Fast ; <nl> + typedef unsigned int FT_UFast ; <nl> + <nl> + # elif FT_SIZEOF_LONG > = ( 32 / FT_CHAR_BIT ) <nl> + <nl> + typedef long FT_Fast ; <nl> + typedef unsigned long FT_UFast ; <nl> + <nl> + # endif <nl> + <nl> + <nl> + / * determine whether we have a 64 - bit ` int ` type for platforms without * / <nl> + / * Autoconf * / <nl> + # if FT_SIZEOF_LONG = = ( 64 / FT_CHAR_BIT ) <nl> + <nl> + / * ` FT_LONG64 ` must be defined if a 64 - bit type is available * / <nl> + # define FT_LONG64 <nl> + # define FT_INT64 long <nl> + # define FT_UINT64 unsigned long <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * A 64 - bit data type may create compilation problems if you compile in <nl> + * strict ANSI mode . To avoid them , we disable other 64 - bit data types if <nl> + * ` __STDC__ ` is defined . You can however ignore this rule by defining the <nl> + * ` FT_CONFIG_OPTION_FORCE_INT64 ` configuration macro . <nl> + * / <nl> + # elif ! defined ( __STDC__ ) | | defined ( FT_CONFIG_OPTION_FORCE_INT64 ) <nl> + <nl> + # if defined ( __STDC_VERSION__ ) & & __STDC_VERSION__ > = 199901L <nl> + <nl> + # define FT_LONG64 <nl> + # define FT_INT64 long long int <nl> + # define FT_UINT64 unsigned long long int <nl> + <nl> + # elif defined ( _MSC_VER ) & & _MSC_VER > = 900 / * Visual C + + ( and Intel C + + ) * / <nl> + <nl> + / * this compiler provides the ` __int64 ` type * / <nl> + # define FT_LONG64 <nl> + # define FT_INT64 __int64 <nl> + # define FT_UINT64 unsigned __int64 <nl> + <nl> + # elif defined ( __BORLANDC__ ) / * Borland C + + * / <nl> + <nl> + / * XXXX : We should probably check the value of ` __BORLANDC__ ` in order * / <nl> + / * to test the compiler version . * / <nl> + <nl> + / * this compiler provides the ` __int64 ` type * / <nl> + # define FT_LONG64 <nl> + # define FT_INT64 __int64 <nl> + # define FT_UINT64 unsigned __int64 <nl> + <nl> + # elif defined ( __WATCOMC__ ) / * Watcom C + + * / <nl> + <nl> + / * Watcom doesn ' t provide 64 - bit data types * / <nl> + <nl> + # elif defined ( __MWERKS__ ) / * Metrowerks CodeWarrior * / <nl> + <nl> + # define FT_LONG64 <nl> + # define FT_INT64 long long int <nl> + # define FT_UINT64 unsigned long long int <nl> + <nl> + # elif defined ( __GNUC__ ) <nl> + <nl> + / * GCC provides the ` long long ` type * / <nl> + # define FT_LONG64 <nl> + # define FT_INT64 long long int <nl> + # define FT_UINT64 unsigned long long int <nl> + <nl> + # endif / * __STDC_VERSION__ > = 199901L * / <nl> + <nl> + # endif / * FT_SIZEOF_LONG = = ( 64 / FT_CHAR_BIT ) * / <nl> + <nl> + # ifdef FT_LONG64 <nl> + typedef FT_INT64 FT_Int64 ; <nl> + typedef FT_UINT64 FT_UInt64 ; <nl> + # endif <nl> + <nl> + <nl> + # endif / * FREETYPE_CONFIG_INTEGER_TYPES_H_ * / <nl> new file mode 100644 <nl> index 00000000000 . . 94867088e9d <nl> mmm / dev / null <nl> ppp b / thirdparty / freetype / include / freetype / config / mac - support . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * config / mac - support . h <nl> + * <nl> + * Mac / OS X support configuration header . <nl> + * <nl> + * Copyright ( C ) 1996 - 2020 by <nl> + * David Turner , Robert Wilhelm , and Werner Lemberg . <nl> + * <nl> + * This file is part of the FreeType project , and may only be used , <nl> + * modified , and distributed under the terms of the FreeType project <nl> + * license , LICENSE . TXT . By continuing to use , modify , or distribute <nl> + * this file you indicate that you have read the license and <nl> + * understand and accept it fully . <nl> + * <nl> + * / <nl> + # ifndef FREETYPE_CONFIG_MAC_SUPPORT_H_ <nl> + # define FREETYPE_CONFIG_MAC_SUPPORT_H_ <nl> + <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * Mac support <nl> + * <nl> + * This is the only necessary change , so it is defined here instead <nl> + * providing a new configuration file . <nl> + * / <nl> + # if defined ( __APPLE__ ) | | ( defined ( __MWERKS__ ) & & defined ( macintosh ) ) <nl> + / * No Carbon frameworks for 64bit 10 . 4 . x . * / <nl> + / * ` AvailabilityMacros . h ` is available since Mac OS X 10 . 2 , * / <nl> + / * so guess the system version by maximum errno before inclusion . * / <nl> + # include < errno . h > <nl> + # ifdef ECANCELED / * defined since 10 . 2 * / <nl> + # include " AvailabilityMacros . h " <nl> + # endif <nl> + # if defined ( __LP64__ ) & & \ <nl> + ( MAC_OS_X_VERSION_MIN_REQUIRED < = MAC_OS_X_VERSION_10_4 ) <nl> + # undef FT_MACINTOSH <nl> + # endif <nl> + <nl> + # elif defined ( __SC__ ) | | defined ( __MRC__ ) <nl> + / * Classic MacOS compilers * / <nl> + # include " ConditionalMacros . h " <nl> + # if TARGET_OS_MAC <nl> + # define FT_MACINTOSH 1 <nl> + # endif <nl> + <nl> + # endif / * Mac support * / <nl> + <nl> + # endif / * FREETYPE_CONFIG_MAC_SUPPORT_H_ * / <nl> new file mode 100644 <nl> index 00000000000 . . 6aa673e807c <nl> mmm / dev / null <nl> ppp b / thirdparty / freetype / include / freetype / config / public - macros . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * config / public - macros . h <nl> + * <nl> + * Define a set of compiler macros used in public FreeType headers . <nl> + * <nl> + * Copyright ( C ) 2020 by <nl> + * David Turner , Robert Wilhelm , and Werner Lemberg . <nl> + * <nl> + * This file is part of the FreeType project , and may only be used , <nl> + * modified , and distributed under the terms of the FreeType project <nl> + * license , LICENSE . TXT . By continuing to use , modify , or distribute <nl> + * this file you indicate that you have read the license and <nl> + * understand and accept it fully . <nl> + * <nl> + * / <nl> + <nl> + / * <nl> + * The definitions in this file are used by the public FreeType headers <nl> + * and thus should be considered part of the public API . <nl> + * <nl> + * Other compiler - specific macro definitions that are not exposed by the <nl> + * FreeType API should go into <nl> + * ` include / freetype / internal / compiler - macros . h ` instead . <nl> + * / <nl> + # ifndef FREETYPE_CONFIG_PUBLIC_MACROS_H_ <nl> + # define FREETYPE_CONFIG_PUBLIC_MACROS_H_ <nl> + <nl> + / * <nl> + * ` FT_BEGIN_HEADER ` and ` FT_END_HEADER ` might have already been defined <nl> + * by ` freetype / config / ftheader . h ` , but we don ' t want to include this <nl> + * header here , so redefine the macros here only when needed . Their <nl> + * definition is very stable , so keeping them in sync with the ones in the <nl> + * header should not be a maintenance issue . <nl> + * / <nl> + # ifndef FT_BEGIN_HEADER <nl> + # ifdef __cplusplus <nl> + # define FT_BEGIN_HEADER extern " C " { <nl> + # else <nl> + # define FT_BEGIN_HEADER / * empty * / <nl> + # endif <nl> + # endif / * FT_BEGIN_HEADER * / <nl> + <nl> + # ifndef FT_END_HEADER <nl> + # ifdef __cplusplus <nl> + # define FT_END_HEADER } <nl> + # else <nl> + # define FT_END_HEADER / * empty * / <nl> + # endif <nl> + # endif / * FT_END_HEADER * / <nl> + <nl> + <nl> + FT_BEGIN_HEADER <nl> + <nl> + / * <nl> + * Mark a function declaration as public . This ensures it will be <nl> + * properly exported to client code . Place this before a function <nl> + * declaration . <nl> + * <nl> + * NOTE : This macro should be considered an internal implementation <nl> + * detail , and not part of the FreeType API . It is only defined here <nl> + * because it is needed by ` FT_EXPORT ` . <nl> + * / <nl> + <nl> + / * Visual C , mingw * / <nl> + # if defined ( _WIN32 ) <nl> + <nl> + # if defined ( FT2_BUILD_LIBRARY ) & & defined ( DLL_EXPORT ) <nl> + # define FT_PUBLIC_FUNCTION_ATTRIBUTE __declspec ( dllexport ) <nl> + # elif defined ( DLL_IMPORT ) <nl> + # define FT_PUBLIC_FUNCTION_ATTRIBUTE __declspec ( dllimport ) <nl> + # endif <nl> + <nl> + / * gcc , clang * / <nl> + # elif ( defined ( __GNUC__ ) & & __GNUC__ > = 4 ) | | defined ( __clang__ ) <nl> + # define FT_PUBLIC_FUNCTION_ATTRIBUTE \ <nl> + __attribute__ ( ( visibility ( " default " ) ) ) <nl> + <nl> + / * Sun * / <nl> + # elif defined ( __SUNPRO_C ) & & __SUNPRO_C > = 0x550 <nl> + # define FT_PUBLIC_FUNCTION_ATTRIBUTE __global <nl> + # endif <nl> + <nl> + <nl> + # ifndef FT_PUBLIC_FUNCTION_ATTRIBUTE <nl> + # define FT_PUBLIC_FUNCTION_ATTRIBUTE / * empty * / <nl> + # endif <nl> + <nl> + <nl> + / * <nl> + * Define a public FreeType API function . This ensures it is properly <nl> + * exported or imported at build time . The macro parameter is the <nl> + * function ' s return type as in : <nl> + * <nl> + * FT_EXPORT ( FT_Bool ) <nl> + * FT_Object_Method ( FT_Object obj , <nl> + * . . . ) ; <nl> + * <nl> + * NOTE : This requires that all ` FT_EXPORT ` uses are inside <nl> + * ` FT_BEGIN_HEADER . . . FT_END_HEADER ` blocks . This guarantees that the <nl> + * functions are exported with C linkage , even when the header is included <nl> + * by a C + + source file . <nl> + * / <nl> + # define FT_EXPORT ( x ) FT_PUBLIC_FUNCTION_ATTRIBUTE extern x <nl> + <nl> + / * <nl> + * ` FT_UNUSED ` indicates that a given parameter is not used - - this is <nl> + * only used to get rid of unpleasant compiler warnings . <nl> + * <nl> + * Technically , this was not meant to be part of the public API , but some <nl> + * third - party code depends on it . <nl> + * / <nl> + # ifndef FT_UNUSED <nl> + # define FT_UNUSED ( arg ) ( ( arg ) = ( arg ) ) <nl> + # endif <nl> + <nl> + <nl> + FT_END_HEADER <nl> + <nl> + # endif / * FREETYPE_CONFIG_PUBLIC_MACROS_H_ * / <nl> mmm a / thirdparty / freetype / include / freetype / freetype . h <nl> ppp b / thirdparty / freetype / include / freetype / freetype . h <nl> <nl> # define FREETYPE_H_ <nl> <nl> <nl> - # ifndef FT_FREETYPE_H <nl> - # error " ` ft2build . h ' hasn ' t been included yet ! " <nl> - # error " Please always use macros to include FreeType header files . " <nl> - # error " Example : " <nl> - # error " # include < ft2build . h > " <nl> - # error " # include FT_FREETYPE_H " <nl> - # endif <nl> - <nl> - <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_TYPES_H <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fttypes . h > <nl> + # include < freetype / fterrors . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> * How client applications should include FreeType header files . <nl> * <nl> * @ description : <nl> - * To be as flexible as possible ( and for historical reasons ) , FreeType <nl> - * uses a very special inclusion scheme to load header files , for example <nl> + * To be as flexible as possible ( and for historical reasons ) , you must <nl> + * load file ` ft2build . h ` first before other header files , for example <nl> * <nl> * ` ` ` <nl> * # include < ft2build . h > <nl> * <nl> - * # include FT_FREETYPE_H <nl> - * # include FT_OUTLINE_H <nl> + * # include < freetype / freetype . h > <nl> + * # include < freetype / ftoutln . h > <nl> * ` ` ` <nl> - * <nl> - * A compiler and its preprocessor only needs an include path to find the <nl> - * file ` ft2build . h ` ; the exact locations and names of the other FreeType <nl> - * header files are hidden by @ header_file_macros , loaded by <nl> - * ` ft2build . h ` . The API documentation always gives the header macro <nl> - * name needed for a particular function . <nl> - * <nl> * / <nl> <nl> <nl> FT_BEGIN_HEADER <nl> * Note that the bounding box might be off by ( at least ) one pixel for <nl> * hinted fonts . See @ FT_Size_Metrics for further discussion . <nl> * <nl> + * Note that the bounding box does not vary in OpenType variable fonts <nl> + * and should only be used in relation to the default instance . <nl> + * <nl> * units_per_EM : : <nl> * The number of font units per EM square for this face . This is <nl> * typically 2048 for TrueType fonts , and 1000 for Type ~ 1 fonts . Only <nl> FT_BEGIN_HEADER <nl> * A pointer to the translation vector . Use ` NULL ` for the null vector . <nl> * <nl> * @ note : <nl> + * This function is provided as a convenience , but keep in mind that <nl> + * @ FT_Matrix coefficients are only 16 . 16 fixed point values , which can <nl> + * limit the accuracy of the results . Using floating - point computations <nl> + * to perform the transform directly in client code instead will always <nl> + * yield better numbers . <nl> + * <nl> * The transformation is only applied to scalable image formats after the <nl> * glyph has been loaded . It means that hinting is unaltered by the <nl> * transformation and is performed on the character size given in the <nl> FT_BEGIN_HEADER <nl> * pixels and use the @ FT_PIXEL_MODE_LCD_V mode . <nl> * <nl> * @ note : <nl> - * Should you define ` FT_CONFIG_OPTION_SUBPIXEL_RENDERING ` in your <nl> - * ` ftoption . h ` , which enables patented ClearType - style rendering , the <nl> - * LCD - optimized glyph bitmaps should be filtered to reduce color fringes <nl> - * inherent to this technology . You can either set up LCD filtering with <nl> - * @ FT_Library_SetLcdFilter or @ FT_Face_Properties , or do the filtering <nl> - * yourself . The default FreeType LCD rendering technology does not <nl> - * require filtering . <nl> - * <nl> * The selected render mode only affects vector glyphs of a font . <nl> * Embedded bitmaps often have a different pixel mode like <nl> * @ FT_PIXEL_MODE_MONO . You can use @ FT_Bitmap_Convert to transform them <nl> FT_BEGIN_HEADER <nl> * https : / / docs . microsoft . com / en - us / typography / opentype / spec / colr <nl> * <nl> * The glyph layer data for a given glyph index , if present , provides an <nl> - * alternative , multi - colour glyph representation : Instead of rendering <nl> + * alternative , multi - color glyph representation : Instead of rendering <nl> * the outline or bitmap with the given glyph index , glyphs with the <nl> * indices and colors returned by this function are rendered layer by <nl> * layer . <nl> FT_BEGIN_HEADER <nl> * / <nl> # define FREETYPE_MAJOR 2 <nl> # define FREETYPE_MINOR 10 <nl> - # define FREETYPE_PATCH 2 <nl> + # define FREETYPE_PATCH 4 <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / include / freetype / ftadvanc . h <nl> ppp b / thirdparty / freetype / include / freetype / ftadvanc . h <nl> <nl> # define FTADVANC_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * load_flags : : <nl> * A set of bit flags similar to those used when calling <nl> * @ FT_Load_Glyph , used to determine what kind of advances you need . <nl> + * <nl> * @ output : <nl> * padvance : : <nl> * The advance value . If scaling is performed ( based on the value of <nl> mmm a / thirdparty / freetype / include / freetype / ftbbox . h <nl> ppp b / thirdparty / freetype / include / freetype / ftbbox . h <nl> <nl> # define FTBBOX_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftbdf . h <nl> ppp b / thirdparty / freetype / include / freetype / ftbdf . h <nl> <nl> # ifndef FTBDF_H_ <nl> # define FTBDF_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftbitmap . h <nl> ppp b / thirdparty / freetype / include / freetype / ftbitmap . h <nl> <nl> # define FTBITMAP_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_COLOR_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftcolor . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftbzip2 . h <nl> ppp b / thirdparty / freetype / include / freetype / ftbzip2 . h <nl> <nl> # ifndef FTBZIP2_H_ <nl> # define FTBZIP2_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * Using bzip2 - compressed font files . <nl> * <nl> * @ description : <nl> + * In certain builds of the library , bzip2 compression recognition is <nl> + * automatically handled when calling @ FT_New_Face or @ FT_Open_Face . <nl> + * This means that if no font driver is capable of handling the raw <nl> + * compressed file , the library will try to open a bzip2 compressed <nl> + * stream from it and re - open the face with it . <nl> + * <nl> + * The stream implementation is very basic and resets the decompression <nl> + * process each time seeking backwards is needed within the stream , <nl> + * which significantly undermines the performance . <nl> + * <nl> * This section contains the declaration of Bzip2 - specific functions . <nl> * <nl> * / <nl> FT_BEGIN_HEADER <nl> * * * not * * call ` FT_Stream_Close ` on the source stream . None of the <nl> * stream objects will be released to the heap . <nl> * <nl> - * The stream implementation is very basic and resets the decompression <nl> - * process each time seeking backwards is needed within the stream . <nl> - * <nl> - * In certain builds of the library , bzip2 compression recognition is <nl> - * automatically handled when calling @ FT_New_Face or @ FT_Open_Face . <nl> - * This means that if no font driver is capable of handling the raw <nl> - * compressed file , the library will try to open a bzip2 compressed <nl> - * stream from it and re - open the face with it . <nl> - * <nl> * This function may return ` FT_Err_Unimplemented_Feature ` if your build <nl> * of FreeType was not compiled with bzip2 support . <nl> * / <nl> mmm a / thirdparty / freetype / include / freetype / ftcache . h <nl> ppp b / thirdparty / freetype / include / freetype / ftcache . h <nl> <nl> # define FTCACHE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_GLYPH_H <nl> + # include < freetype / ftglyph . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / ftcid . h <nl> ppp b / thirdparty / freetype / include / freetype / ftcid . h <nl> <nl> # ifndef FTCID_H_ <nl> # define FTCID_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftcolor . h <nl> ppp b / thirdparty / freetype / include / freetype / ftcolor . h <nl> <nl> # ifndef FTCOLOR_H_ <nl> # define FTCOLOR_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftdriver . h <nl> ppp b / thirdparty / freetype / include / freetype / ftdriver . h <nl> <nl> # ifndef FTDRIVER_H_ <nl> # define FTDRIVER_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_PARAMETER_TAGS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftparams . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * counteracts the ' thinning out ' of glyphs , making text remain readable <nl> * at smaller sizes . <nl> * <nl> - * By default , the Adobe engines for CFF , Type ~ 1 , and CID fonts darken <nl> - * stems at smaller sizes , regardless of hinting , to enhance contrast . <nl> - * Setting this property , stem darkening gets switched off . <nl> - * <nl> * For the auto - hinter , stem - darkening is experimental currently and thus <nl> * switched off by default ( this is , ` no - stem - darkening ` is set to TRUE <nl> * by default ) . Total consistency with the CFF driver is not achieved <nl> mmm a / thirdparty / freetype / include / freetype / fterrors . h <nl> ppp b / thirdparty / freetype / include / freetype / fterrors . h <nl> <nl> * const char * err_msg ; <nl> * } ft_errors [ ] = <nl> * <nl> - * # include FT_ERRORS_H <nl> + * # include < freetype / fterrors . h > <nl> * ` ` ` <nl> * <nl> * An alternative to using an array is a switch statement . <nl> <nl> <nl> <nl> / * include module base error codes * / <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> <nl> <nl> <nl> / * now include the error codes * / <nl> - # include FT_ERROR_DEFINITIONS_H <nl> + # include < freetype / fterrdef . h > <nl> <nl> <nl> # ifdef FT_ERROR_END_LIST <nl> <nl> # undef FT_ERR_PREFIX <nl> # endif <nl> <nl> - / * FT_INCLUDE_ERR_PROTOS : Control if function prototypes should be * / <nl> - / * included with ` # include FT_ERRORS_H ' . This is * / <nl> - / * only true where ` FT_ERRORDEF ` is undefined . * / <nl> - / * FT_ERR_PROTOS_DEFINED : Actual multiple - inclusion protection of * / <nl> - / * ` fterrors . h ` . * / <nl> + / * FT_INCLUDE_ERR_PROTOS : Control whether function prototypes should be * / <nl> + / * included with * / <nl> + / * * / <nl> + / * # include < freetype / fterrors . h > * / <nl> + / * * / <nl> + / * This is only true where ` FT_ERRORDEF ` is * / <nl> + / * undefined . * / <nl> + / * * / <nl> + / * FT_ERR_PROTOS_DEFINED : Actual multiple - inclusion protection of * / <nl> + / * ` fterrors . h ` . * / <nl> # ifdef FT_INCLUDE_ERR_PROTOS <nl> # undef FT_INCLUDE_ERR_PROTOS <nl> <nl> mmm a / thirdparty / freetype / include / freetype / ftfntfmt . h <nl> ppp b / thirdparty / freetype / include / freetype / ftfntfmt . h <nl> <nl> # ifndef FTFNTFMT_H_ <nl> # define FTFNTFMT_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftgasp . h <nl> ppp b / thirdparty / freetype / include / freetype / ftgasp . h <nl> <nl> # ifndef FTGASP_H_ <nl> # define FTGASP_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftglyph . h <nl> ppp b / thirdparty / freetype / include / freetype / ftglyph . h <nl> <nl> # define FTGLYPH_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftgxval . h <nl> ppp b / thirdparty / freetype / include / freetype / ftgxval . h <nl> <nl> # ifndef FTGXVAL_H_ <nl> # define FTGXVAL_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftgzip . h <nl> ppp b / thirdparty / freetype / include / freetype / ftgzip . h <nl> <nl> # ifndef FTGZIP_H_ <nl> # define FTGZIP_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * Using gzip - compressed font files . <nl> * <nl> * @ description : <nl> + * In certain builds of the library , gzip compression recognition is <nl> + * automatically handled when calling @ FT_New_Face or @ FT_Open_Face . <nl> + * This means that if no font driver is capable of handling the raw <nl> + * compressed file , the library will try to open a gzipped stream from it <nl> + * and re - open the face with it . <nl> + * <nl> + * The stream implementation is very basic and resets the decompression <nl> + * process each time seeking backwards is needed within the stream , <nl> + * which significantly undermines the performance . <nl> + * <nl> * This section contains the declaration of Gzip - specific functions . <nl> * <nl> * / <nl> FT_BEGIN_HEADER <nl> * * * not * * call ` FT_Stream_Close ` on the source stream . None of the <nl> * stream objects will be released to the heap . <nl> * <nl> - * The stream implementation is very basic and resets the decompression <nl> - * process each time seeking backwards is needed within the stream . <nl> - * <nl> - * In certain builds of the library , gzip compression recognition is <nl> - * automatically handled when calling @ FT_New_Face or @ FT_Open_Face . <nl> - * This means that if no font driver is capable of handling the raw <nl> - * compressed file , the library will try to open a gzipped stream from it <nl> - * and re - open the face with it . <nl> - * <nl> * This function may return ` FT_Err_Unimplemented_Feature ` if your build <nl> * of FreeType was not compiled with zlib support . <nl> * / <nl> mmm a / thirdparty / freetype / include / freetype / ftimage . h <nl> ppp b / thirdparty / freetype / include / freetype / ftimage . h <nl> <nl> <nl> / * STANDALONE_ is from ftgrays . c * / <nl> # ifndef STANDALONE_ <nl> - # include < ft2build . h > <nl> # endif <nl> <nl> <nl> FT_BEGIN_HEADER <nl> * if @ FT_OUTLINE_IGNORE_DROPOUTS is set . See below for more <nl> * information . <nl> * <nl> + * FT_OUTLINE_OVERLAP : : <nl> + * This flag indicates that this outline contains overlapping contrours <nl> + * and the anti - aliased renderer should perform oversampling to <nl> + * mitigate possible artifacts . This flag should _not_ be set for <nl> + * well designed glyphs without overlaps because it quadruples the <nl> + * rendering time . <nl> + * <nl> * FT_OUTLINE_HIGH_PRECISION : : <nl> * This flag indicates that the scan - line converter should try to <nl> * convert this outline to bitmaps with the highest possible quality . <nl> FT_BEGIN_HEADER <nl> # define FT_OUTLINE_IGNORE_DROPOUTS 0x8 <nl> # define FT_OUTLINE_SMART_DROPOUTS 0x10 <nl> # define FT_OUTLINE_INCLUDE_STUBS 0x20 <nl> + # define FT_OUTLINE_OVERLAP 0x40 <nl> <nl> # define FT_OUTLINE_HIGH_PRECISION 0x100 <nl> # define FT_OUTLINE_SINGLE_PASS 0x200 <nl> FT_BEGIN_HEADER <nl> * User - supplied data that is passed to each drawing callback . <nl> * <nl> * clip_box : : <nl> - * An optional clipping box . It is only used in direct rendering mode . <nl> - * Note that coordinates here should be expressed in _integer_ pixels <nl> - * ( and not in 26 . 6 fixed - point units ) . <nl> + * An optional span clipping box expressed in _integer_ pixels <nl> + * ( not in 26 . 6 fixed - point units ) . <nl> * <nl> * @ note : <nl> - * An anti - aliased glyph bitmap is drawn if the @ FT_RASTER_FLAG_AA bit <nl> - * flag is set in the ` flags ` field , otherwise a monochrome bitmap is <nl> - * generated . <nl> - * <nl> - * If the @ FT_RASTER_FLAG_DIRECT bit flag is set in ` flags ` , the raster <nl> - * will call the ` gray_spans ` callback to draw gray pixel spans . This <nl> - * allows direct composition over a pre - existing bitmap through <nl> - * user - provided callbacks to perform the span drawing and composition . <nl> - * Not supported by the monochrome rasterizer . <nl> + * The @ FT_RASTER_FLAG_AA bit flag must be set in the ` flags ` to <nl> + * generate an anti - aliased glyph bitmap , otherwise a monochrome bitmap <nl> + * is generated . The ` target ` should have appropriate pixel mode and its <nl> + * dimensions define the clipping region . <nl> + * <nl> + * If both @ FT_RASTER_FLAG_AA and @ FT_RASTER_FLAG_DIRECT bit flags <nl> + * are set in ` flags ` , the raster calls an @ FT_SpanFunc callback <nl> + * ` gray_spans ` with ` user ` data as an argument ignoring ` target ` . This <nl> + * allows direct composition over a pre - existing user surface to perform <nl> + * the span drawing and composition . To optionally clip the spans , set <nl> + * the @ FT_RASTER_FLAG_CLIP flag and ` clip_box ` . The monochrome raster <nl> + * does not support the direct mode . <nl> + * <nl> + * The gray - level rasterizer always uses 256 gray levels . If you want <nl> + * fewer gray levels , you have to use @ FT_RASTER_FLAG_DIRECT and reduce <nl> + * the levels in the callback function . <nl> * / <nl> typedef struct FT_Raster_Params_ <nl> { <nl> mmm a / thirdparty / freetype / include / freetype / ftincrem . h <nl> ppp b / thirdparty / freetype / include / freetype / ftincrem . h <nl> <nl> # ifndef FTINCREM_H_ <nl> # define FTINCREM_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_PARAMETER_TAGS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftparams . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftlcdfil . h <nl> ppp b / thirdparty / freetype / include / freetype / ftlcdfil . h <nl> <nl> # ifndef FTLCDFIL_H_ <nl> # define FTLCDFIL_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_PARAMETER_TAGS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftparams . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * @ description : <nl> * FreeType provides two alternative subpixel rendering technologies . <nl> * Should you define ` FT_CONFIG_OPTION_SUBPIXEL_RENDERING ` in your <nl> - * ` ftoption . h ` file , this enables patented ClearType - style rendering . <nl> + * ` ftoption . h ` file , this enables ClearType - style rendering . <nl> * Otherwise , Harmony LCD rendering is enabled . These technologies are <nl> * controlled differently and API described below , although always <nl> * available , performs its function when appropriate method is enabled <nl> FT_BEGIN_HEADER <nl> * FT_Library_SetLcdFilter <nl> * <nl> * @ description : <nl> - * This function is used to apply color filtering to LCD decimated <nl> + * This function is used to change filter applied to LCD decimated <nl> * bitmaps , like the ones used when calling @ FT_Render_Glyph with <nl> * @ FT_RENDER_MODE_LCD or @ FT_RENDER_MODE_LCD_V . <nl> * <nl> FT_BEGIN_HEADER <nl> * FreeType error code . 0 ~ means success . <nl> * <nl> * @ note : <nl> - * This feature is always disabled by default . Clients must make an <nl> - * explicit call to this function with a ` filter ` value other than <nl> - * @ FT_LCD_FILTER_NONE in order to enable it . <nl> + * Since 2 . 10 . 3 the LCD filtering is enabled with @ FT_LCD_FILTER_DEFAULT . <nl> + * It is no longer necessary to call this function explicitly except <nl> + * to choose a different filter or disable filtering altogether with <nl> + * @ FT_LCD_FILTER_NONE . <nl> * <nl> - * Due to * * PATENTS * * covering subpixel rendering , this function doesn ' t <nl> - * do anything except returning ` FT_Err_Unimplemented_Feature ` if the <nl> - * configuration macro ` FT_CONFIG_OPTION_SUBPIXEL_RENDERING ` is not <nl> - * defined in your build of the library , which should correspond to all <nl> - * default builds of FreeType . <nl> + * This function does nothing but returns ` FT_Err_Unimplemented_Feature ` <nl> + * if the configuration macro ` FT_CONFIG_OPTION_SUBPIXEL_RENDERING ` is <nl> + * not defined in your build of the library . <nl> * <nl> * @ since : <nl> * 2 . 3 . 0 <nl> FT_BEGIN_HEADER <nl> * FreeType error code . 0 ~ means success . <nl> * <nl> * @ note : <nl> - * Due to * * PATENTS * * covering subpixel rendering , this function doesn ' t <nl> - * do anything except returning ` FT_Err_Unimplemented_Feature ` if the <nl> - * configuration macro ` FT_CONFIG_OPTION_SUBPIXEL_RENDERING ` is not <nl> - * defined in your build of the library , which should correspond to all <nl> - * default builds of FreeType . <nl> + * This function does nothing but returns ` FT_Err_Unimplemented_Feature ` <nl> + * if the configuration macro ` FT_CONFIG_OPTION_SUBPIXEL_RENDERING ` is <nl> + * not defined in your build of the library . <nl> * <nl> * LCD filter weights can also be set per face using @ FT_Face_Properties <nl> * with @ FT_PARAM_TAG_LCD_FILTER_WEIGHTS . <nl> mmm a / thirdparty / freetype / include / freetype / ftlist . h <nl> ppp b / thirdparty / freetype / include / freetype / ftlist . h <nl> <nl> # define FTLIST_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftlzw . h <nl> ppp b / thirdparty / freetype / include / freetype / ftlzw . h <nl> <nl> # ifndef FTLZW_H_ <nl> # define FTLZW_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * Using LZW - compressed font files . <nl> * <nl> * @ description : <nl> + * In certain builds of the library , LZW compression recognition is <nl> + * automatically handled when calling @ FT_New_Face or @ FT_Open_Face . <nl> + * This means that if no font driver is capable of handling the raw <nl> + * compressed file , the library will try to open a LZW stream from it and <nl> + * re - open the face with it . <nl> + * <nl> + * The stream implementation is very basic and resets the decompression <nl> + * process each time seeking backwards is needed within the stream , <nl> + * which significantly undermines the performance . <nl> + * <nl> * This section contains the declaration of LZW - specific functions . <nl> * <nl> * / <nl> FT_BEGIN_HEADER <nl> * * * not * * call ` FT_Stream_Close ` on the source stream . None of the <nl> * stream objects will be released to the heap . <nl> * <nl> - * The stream implementation is very basic and resets the decompression <nl> - * process each time seeking backwards is needed within the stream <nl> - * <nl> - * In certain builds of the library , LZW compression recognition is <nl> - * automatically handled when calling @ FT_New_Face or @ FT_Open_Face . <nl> - * This means that if no font driver is capable of handling the raw <nl> - * compressed file , the library will try to open a LZW stream from it and <nl> - * re - open the face with it . <nl> - * <nl> * This function may return ` FT_Err_Unimplemented_Feature ` if your build <nl> * of FreeType was not compiled with LZW support . <nl> * / <nl> mmm a / thirdparty / freetype / include / freetype / ftmac . h <nl> ppp b / thirdparty / freetype / include / freetype / ftmac . h <nl> <nl> # define FTMAC_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / ftmm . h <nl> ppp b / thirdparty / freetype / include / freetype / ftmm . h <nl> <nl> # define FTMM_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TYPE1_TABLES_H <nl> + # include < freetype / t1tables . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / ftmodapi . h <nl> ppp b / thirdparty / freetype / include / freetype / ftmodapi . h <nl> <nl> # define FTMODAPI_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * psnames <nl> * raster1 <nl> * sfnt <nl> - * smooth , smooth - lcd , smooth - lcdv <nl> + * smooth <nl> * truetype <nl> * type1 <nl> * type42 <nl> FT_BEGIN_HEADER <nl> * <nl> * ` ` ` <nl> * FREETYPE_PROPERTIES = truetype : interpreter - version = 35 \ <nl> - * cff : no - stem - darkening = 1 \ <nl> + * cff : no - stem - darkening = 0 \ <nl> * autofitter : warping = 1 <nl> * ` ` ` <nl> * <nl> mmm a / thirdparty / freetype / include / freetype / ftmoderr . h <nl> ppp b / thirdparty / freetype / include / freetype / ftmoderr . h <nl> <nl> * const char * mod_err_msg <nl> * } ft_mod_errors [ ] = <nl> * <nl> - * # include FT_MODULE_ERRORS_H <nl> + * # include < freetype / ftmoderr . h > <nl> * ` ` ` <nl> * <nl> * / <nl> mmm a / thirdparty / freetype / include / freetype / ftotval . h <nl> ppp b / thirdparty / freetype / include / freetype / ftotval . h <nl> <nl> # ifndef FTOTVAL_H_ <nl> # define FTOTVAL_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftoutln . h <nl> ppp b / thirdparty / freetype / include / freetype / ftoutln . h <nl> <nl> # define FTOUTLN_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> FT_BEGIN_HEADER <nl> * FreeType error code . 0 ~ means success . <nl> * <nl> * @ note : <nl> - * This advanced function uses @ FT_Raster_Params as an argument , <nl> - * allowing FreeType rasterizer to be used for direct composition , <nl> - * translucency , etc . You should know how to set up @ FT_Raster_Params <nl> - * for this function to work . <nl> - * <nl> + * This advanced function uses @ FT_Raster_Params as an argument . <nl> * The field ` params . source ` will be set to ` outline ` before the scan <nl> * converter is called , which means that the value you give to it is <nl> - * actually ignored . <nl> - * <nl> - * The gray - level rasterizer always uses 256 gray levels . If you want <nl> - * less gray levels , you have to provide your own span callback . See the <nl> - * @ FT_RASTER_FLAG_DIRECT value of the ` flags ` field in the <nl> - * @ FT_Raster_Params structure for more details . <nl> + * actually ignored . Either ` params . target ` must point to preallocated <nl> + * bitmap , or @ FT_RASTER_FLAG_DIRECT must be set in ` params . flags ` <nl> + * allowing FreeType rasterizer to be used for direct composition , <nl> + * translucency , etc . See @ FT_Raster_Params for more details . <nl> * / <nl> FT_EXPORT ( FT_Error ) <nl> FT_Outline_Render ( FT_Library library , <nl> mmm a / thirdparty / freetype / include / freetype / ftparams . h <nl> ppp b / thirdparty / freetype / include / freetype / ftparams . h <nl> <nl> # ifndef FTPARAMS_H_ <nl> # define FTPARAMS_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftpfr . h <nl> ppp b / thirdparty / freetype / include / freetype / ftpfr . h <nl> <nl> # ifndef FTPFR_H_ <nl> # define FTPFR_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftrender . h <nl> ppp b / thirdparty / freetype / include / freetype / ftrender . h <nl> <nl> # define FTRENDER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> - # include FT_GLYPH_H <nl> + # include < freetype / ftmodapi . h > <nl> + # include < freetype / ftglyph . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / ftsizes . h <nl> ppp b / thirdparty / freetype / include / freetype / ftsizes . h <nl> <nl> # define FTSIZES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftsnames . h <nl> ppp b / thirdparty / freetype / include / freetype / ftsnames . h <nl> <nl> # define FTSNAMES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_PARAMETER_TAGS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftparams . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftstroke . h <nl> ppp b / thirdparty / freetype / include / freetype / ftstroke . h <nl> <nl> # ifndef FTSTROKE_H_ <nl> # define FTSTROKE_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_OUTLINE_H <nl> - # include FT_GLYPH_H <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftglyph . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> * borders of the stroke . <nl> * <nl> * This can be useful to generate ' bordered ' glyph , i . e . , glyphs <nl> - * displayed with a coloured ( and anti - aliased ) border around their <nl> + * displayed with a colored ( and anti - aliased ) border around their <nl> * shape . <nl> * <nl> * @ order : <nl> mmm a / thirdparty / freetype / include / freetype / ftsynth . h <nl> ppp b / thirdparty / freetype / include / freetype / ftsynth . h <nl> <nl> # define FTSYNTH_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ftsystem . h <nl> ppp b / thirdparty / freetype / include / freetype / ftsystem . h <nl> <nl> # define FTSYSTEM_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / fttrigon . h <nl> ppp b / thirdparty / freetype / include / freetype / fttrigon . h <nl> <nl> # ifndef FTTRIGON_H_ <nl> # define FTTRIGON_H_ <nl> <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / fttypes . h <nl> ppp b / thirdparty / freetype / include / freetype / fttypes . h <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_SYSTEM_H <nl> - # include FT_IMAGE_H <nl> + # include < freetype / ftsystem . h > <nl> + # include < freetype / ftimage . h > <nl> <nl> # include < stddef . h > <nl> <nl> mmm a / thirdparty / freetype / include / freetype / ftwinfnt . h <nl> ppp b / thirdparty / freetype / include / freetype / ftwinfnt . h <nl> <nl> # ifndef FTWINFNT_H_ <nl> # define FTWINFNT_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / internal / autohint . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / autohint . h <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> } FT_AutoHinter_InterfaceRec , * FT_AutoHinter_Interface ; <nl> <nl> <nl> + # define FT_DECLARE_AUTOHINTER_INTERFACE ( class_ ) \ <nl> + FT_CALLBACK_TABLE const FT_AutoHinter_InterfaceRec class_ ; <nl> + <nl> # define FT_DEFINE_AUTOHINTER_INTERFACE ( \ <nl> class_ , \ <nl> reset_face_ , \ <nl> mmm a / thirdparty / freetype / include / freetype / internal / cffotypes . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / cffotypes . h <nl> <nl> # ifndef CFFOTYPES_H_ <nl> # define CFFOTYPES_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / cfftypes . h > <nl> + # include < freetype / internal / tttypes . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / pshints . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / cfftypes . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / cfftypes . h <nl> <nl> # define CFFTYPES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_TYPE1_TABLES_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / t1tables . h > <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / pshints . h > <nl> + # include < freetype / internal / t1types . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> new file mode 100644 <nl> index 00000000000 . . 97c18d3a214 <nl> mmm / dev / null <nl> ppp b / thirdparty / freetype / include / freetype / internal / compiler - macros . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + * <nl> + * internal / compiler - macros . h <nl> + * <nl> + * Compiler - specific macro definitions used internally by FreeType . <nl> + * <nl> + * Copyright ( C ) 2020 by <nl> + * David Turner , Robert Wilhelm , and Werner Lemberg . <nl> + * <nl> + * This file is part of the FreeType project , and may only be used , <nl> + * modified , and distributed under the terms of the FreeType project <nl> + * license , LICENSE . TXT . By continuing to use , modify , or distribute <nl> + * this file you indicate that you have read the license and <nl> + * understand and accept it fully . <nl> + * <nl> + * / <nl> + <nl> + # ifndef INTERNAL_COMPILER_MACROS_H_ <nl> + # define INTERNAL_COMPILER_MACROS_H_ <nl> + <nl> + # include < freetype / config / public - macros . h > <nl> + <nl> + FT_BEGIN_HEADER <nl> + <nl> + / * Fix compiler warning with sgi compiler . * / <nl> + # if defined ( __sgi ) & & ! defined ( __GNUC__ ) <nl> + # if defined ( _COMPILER_VERSION ) & & ( _COMPILER_VERSION > = 730 ) <nl> + # pragma set woff 3505 <nl> + # endif <nl> + # endif <nl> + <nl> + / * Fix compiler warning with sgi compiler . * / <nl> + # if defined ( __sgi ) & & ! defined ( __GNUC__ ) <nl> + # if defined ( _COMPILER_VERSION ) & & ( _COMPILER_VERSION > = 730 ) <nl> + # pragma set woff 3505 <nl> + # endif <nl> + # endif <nl> + <nl> + / * <nl> + * When defining a macro that expands to a non - trivial C statement , use <nl> + * FT_BEGIN_STMNT and FT_END_STMNT to enclose the macro ' s body . This <nl> + * ensures there are no surprises when the macro is invoked in conditional <nl> + * branches . <nl> + * <nl> + * Example : <nl> + * <nl> + * # define LOG ( . . . ) \ <nl> + * FT_BEGIN_STMNT \ <nl> + * if ( logging_enabled ) \ <nl> + * log ( __VA_ARGS__ ) ; \ <nl> + * FT_END_STMNT <nl> + * / <nl> + # define FT_BEGIN_STMNT do { <nl> + # define FT_END_STMNT } while ( 0 ) <nl> + <nl> + / * <nl> + * FT_DUMMY_STMNT expands to an empty C statement . Useful for <nl> + * conditionally defined statement macros . <nl> + * <nl> + * Example : <nl> + * <nl> + * # ifdef BUILD_CONFIG_LOGGING <nl> + * # define LOG ( . . . ) \ <nl> + * FT_BEGIN_STMNT \ <nl> + * if ( logging_enabled ) \ <nl> + * log ( __VA_ARGS__ ) ; \ <nl> + * FT_END_STMNT <nl> + * # else <nl> + * # define LOG ( . . . ) FT_DUMMY_STMNT <nl> + * # endif <nl> + * / <nl> + # define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT <nl> + <nl> + # ifdef _WIN64 <nl> + / * only 64bit Windows uses the LLP64 data model , i . e . , * / <nl> + / * 32 - bit integers , 64 - bit pointers . * / <nl> + # define FT_UINT_TO_POINTER ( x ) ( void * ) ( unsigned __int64 ) ( x ) <nl> + # else <nl> + # define FT_UINT_TO_POINTER ( x ) ( void * ) ( unsigned long ) ( x ) <nl> + # endif <nl> + <nl> + / * <nl> + * Use ` FT_TYPEOF ( type ) ` to cast a value to ` type ` . This is useful to <nl> + * suppress signedness compilation warnings in macros . <nl> + * <nl> + * Example : <nl> + * <nl> + * # define PAD_ ( x , n ) ( ( x ) & ~ FT_TYPEOF ( x ) ( ( n ) - 1 ) ) <nl> + * <nl> + * ( The ` typeof ` condition is taken from gnulib ' s ` intprops . h ` header <nl> + * file . ) <nl> + * / <nl> + # if ( ( defined ( __GNUC__ ) & & __GNUC__ > = 2 ) | | \ <nl> + ( defined ( __IBMC__ ) & & __IBMC__ > = 1210 & & \ <nl> + defined ( __IBM__TYPEOF__ ) ) | | \ <nl> + ( defined ( __SUNPRO_C ) & & __SUNPRO_C > = 0x5110 & & ! __STDC__ ) ) <nl> + # define FT_TYPEOF ( type ) ( __typeof__ ( type ) ) <nl> + # else <nl> + # define FT_TYPEOF ( type ) / * empty * / <nl> + # endif <nl> + <nl> + / * <nl> + * Mark a function declaration as internal to the library . This ensures <nl> + * that it will not be exposed by default to client code , and helps <nl> + * generate smaller and faster code on ELF - based platforms . Place this <nl> + * before a function declaration . <nl> + * / <nl> + <nl> + / * Visual C , mingw * / <nl> + # if defined ( _WIN32 ) <nl> + # define FT_INTERNAL_FUNCTION_ATTRIBUTE / * empty * / <nl> + <nl> + / * gcc , clang * / <nl> + # elif ( defined ( __GNUC__ ) & & __GNUC__ > = 4 ) | | defined ( __clang__ ) <nl> + # define FT_INTERNAL_FUNCTION_ATTRIBUTE \ <nl> + __attribute__ ( ( visibility ( " hidden " ) ) ) <nl> + <nl> + / * Sun * / <nl> + # elif defined ( __SUNPRO_C ) & & __SUNPRO_C > = 0x550 <nl> + # define FT_INTERNAL_FUNCTION_ATTRIBUTE __hidden <nl> + <nl> + # else <nl> + # define FT_INTERNAL_FUNCTION_ATTRIBUTE / * empty * / <nl> + # endif <nl> + <nl> + / * <nl> + * FreeType supports compilation of its C sources with a C + + compiler ( in <nl> + * C + + mode ) ; this introduces a number of subtle issues . <nl> + * <nl> + * The main one is that a C + + function declaration and its definition must <nl> + * have the same ' linkage ' . Because all FreeType headers declare their <nl> + * functions with C linkage ( i . e . , within an ` extern " C " { . . . } ` block <nl> + * due to the magic of FT_BEGIN_HEADER and FT_END_HEADER ) , their <nl> + * definition in FreeType sources should also be prefixed with ` extern <nl> + * " C " ` when compiled in C + + mode . <nl> + * <nl> + * The ` FT_FUNCTION_DECLARATION ` and ` FT_FUNCTION_DEFINITION ` macros are <nl> + * provided to deal with this case , as well as ` FT_CALLBACK_DEF ` and its <nl> + * siblings below . <nl> + * / <nl> + <nl> + / * <nl> + * ` FT_FUNCTION_DECLARATION ( type ) ` can be used to write a C function <nl> + * declaration to ensure it will have C linkage when the library is built <nl> + * with a C + + compiler . The parameter is the function ' s return type , so a <nl> + * declaration would look like <nl> + * <nl> + * FT_FUNCTION_DECLARATION ( int ) <nl> + * foo ( int x ) ; <nl> + * <nl> + * NOTE : This requires that all uses are inside of ` FT_BEGIN_HEADER . . . <nl> + * FT_END_HEADER ` blocks , which guarantees that the declarations have C <nl> + * linkage when the headers are included by C + + sources . <nl> + * <nl> + * NOTE : Do not use directly . Use ` FT_LOCAL ` , ` FT_BASE ` , and ` FT_EXPORT ` <nl> + * instead . <nl> + * / <nl> + # define FT_FUNCTION_DECLARATION ( x ) extern x <nl> + <nl> + / * <nl> + * Same as ` FT_FUNCTION_DECLARATION ` , but for function definitions instead . <nl> + * <nl> + * NOTE : Do not use directly . Use ` FT_LOCAL_DEF ` , ` FT_BASE_DEF ` , and <nl> + * ` FT_EXPORT_DEF ` instead . <nl> + * / <nl> + # ifdef __cplusplus <nl> + # define FT_FUNCTION_DEFINITION ( x ) extern " C " x <nl> + # else <nl> + # define FT_FUNCTION_DEFINITION ( x ) x <nl> + # endif <nl> + <nl> + / * <nl> + * Use ` FT_LOCAL ` and ` FT_LOCAL_DEF ` to declare and define , respectively , <nl> + * an internal FreeType function that is only used by the sources of a <nl> + * single ` src / module / ` directory . This ensures that the functions are <nl> + * turned into static ones at build time , resulting in smaller and faster <nl> + * code . <nl> + * / <nl> + # ifdef FT_MAKE_OPTION_SINGLE_OBJECT <nl> + <nl> + # define FT_LOCAL ( x ) static x <nl> + # define FT_LOCAL_DEF ( x ) static x <nl> + <nl> + # else <nl> + <nl> + # define FT_LOCAL ( x ) FT_INTERNAL_FUNCTION_ATTRIBUTE \ <nl> + FT_FUNCTION_DECLARATION ( x ) <nl> + # define FT_LOCAL_DEF ( x ) FT_FUNCTION_DEFINITION ( x ) <nl> + <nl> + # endif / * FT_MAKE_OPTION_SINGLE_OBJECT * / <nl> + <nl> + / * <nl> + * Use ` FT_LOCAL_ARRAY ` and ` FT_LOCAL_ARRAY_DEF ` to declare and define , <nl> + * respectively , a constant array that must be accessed from several <nl> + * sources in the same ` src / module / ` sub - directory , and which are internal <nl> + * to the library . <nl> + * / <nl> + # define FT_LOCAL_ARRAY ( x ) FT_INTERNAL_FUNCTION_ATTRIBUTE \ <nl> + extern const x <nl> + # define FT_LOCAL_ARRAY_DEF ( x ) FT_FUNCTION_DEFINITION ( const x ) <nl> + <nl> + / * <nl> + * ` Use FT_BASE ` and ` FT_BASE_DEF ` to declare and define , respectively , an <nl> + * internal library function that is used by more than a single module . <nl> + * / <nl> + # define FT_BASE ( x ) FT_INTERNAL_FUNCTION_ATTRIBUTE \ <nl> + FT_FUNCTION_DECLARATION ( x ) <nl> + # define FT_BASE_DEF ( x ) FT_FUNCTION_DEFINITION ( x ) <nl> + <nl> + <nl> + / * <nl> + * NOTE : Conditionally define ` FT_EXPORT_VAR ` due to its definition in <nl> + * ` src / smooth / ftgrays . h ` to make the header more portable . <nl> + * / <nl> + # ifndef FT_EXPORT_VAR <nl> + # define FT_EXPORT_VAR ( x ) FT_FUNCTION_DECLARATION ( x ) <nl> + # endif <nl> + <nl> + / * When compiling FreeType as a DLL or DSO with hidden visibility , * / <nl> + / * some systems / compilers need a special attribute in front OR after * / <nl> + / * the return type of function declarations . * / <nl> + / * * / <nl> + / * Two macros are used within the FreeType source code to define * / <nl> + / * exported library functions : ` FT_EXPORT ` and ` FT_EXPORT_DEF ` . * / <nl> + / * * / <nl> + / * - ` FT_EXPORT ( return_type ) ` * / <nl> + / * * / <nl> + / * is used in a function declaration , as in * / <nl> + / * * / <nl> + / * ` ` ` * / <nl> + / * FT_EXPORT ( FT_Error ) * / <nl> + / * FT_Init_FreeType ( FT_Library * alibrary ) ; * / <nl> + / * ` ` ` * / <nl> + / * * / <nl> + / * - ` FT_EXPORT_DEF ( return_type ) ` * / <nl> + / * * / <nl> + / * is used in a function definition , as in * / <nl> + / * * / <nl> + / * ` ` ` * / <nl> + / * FT_EXPORT_DEF ( FT_Error ) * / <nl> + / * FT_Init_FreeType ( FT_Library * alibrary ) * / <nl> + / * { * / <nl> + / * . . . some code . . . * / <nl> + / * return FT_Err_Ok ; * / <nl> + / * } * / <nl> + / * ` ` ` * / <nl> + / * * / <nl> + / * You can provide your own implementation of ` FT_EXPORT ` and * / <nl> + / * ` FT_EXPORT_DEF ` here if you want . * / <nl> + / * * / <nl> + / * To export a variable , use ` FT_EXPORT_VAR ` . * / <nl> + / * * / <nl> + <nl> + / * See ` freetype / config / compiler_macros . h ` for the ` FT_EXPORT ` definition * / <nl> + # define FT_EXPORT_DEF ( x ) FT_FUNCTION_DEFINITION ( x ) <nl> + <nl> + / * The following macros are needed to compile the library with a * / <nl> + / * C + + compiler and with 16bit compilers . * / <nl> + / * * / <nl> + <nl> + / * This is special . Within C + + , you must specify ` extern " C " ` for * / <nl> + / * functions which are used via function pointers , and you also * / <nl> + / * must do that for structures which contain function pointers to * / <nl> + / * assure C linkage - - it ' s not possible to have ( local ) anonymous * / <nl> + / * functions which are accessed by ( global ) function pointers . * / <nl> + / * * / <nl> + / * * / <nl> + / * FT_CALLBACK_DEF is used to _define_ a callback function , * / <nl> + / * located in the same source code file as the structure that uses * / <nl> + / * it . * / <nl> + / * * / <nl> + / * FT_BASE_CALLBACK and FT_BASE_CALLBACK_DEF are used to declare * / <nl> + / * and define a callback function , respectively , in a similar way * / <nl> + / * as FT_BASE and FT_BASE_DEF work . * / <nl> + / * * / <nl> + / * FT_CALLBACK_TABLE is used to _declare_ a constant variable that * / <nl> + / * contains pointers to callback functions . * / <nl> + / * * / <nl> + / * FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable * / <nl> + / * that contains pointers to callback functions . * / <nl> + / * * / <nl> + / * * / <nl> + / * Some 16bit compilers have to redefine these macros to insert * / <nl> + / * the infamous ` _cdecl ` or ` __fastcall ` declarations . * / <nl> + / * * / <nl> + # ifdef __cplusplus <nl> + # define FT_CALLBACK_DEF ( x ) extern " C " x <nl> + # else <nl> + # define FT_CALLBACK_DEF ( x ) static x <nl> + # endif <nl> + <nl> + # define FT_BASE_CALLBACK ( x ) FT_FUNCTION_DECLARATION ( x ) <nl> + # define FT_BASE_CALLBACK_DEF ( x ) FT_FUNCTION_DEFINITION ( x ) <nl> + <nl> + # ifndef FT_CALLBACK_TABLE <nl> + # ifdef __cplusplus <nl> + # define FT_CALLBACK_TABLE extern " C " <nl> + # define FT_CALLBACK_TABLE_DEF extern " C " <nl> + # else <nl> + # define FT_CALLBACK_TABLE extern <nl> + # define FT_CALLBACK_TABLE_DEF / * nothing * / <nl> + # endif <nl> + # endif / * FT_CALLBACK_TABLE * / <nl> + <nl> + FT_END_HEADER <nl> + <nl> + # endif / * INTERNAL_COMPILER_MACROS_H_ * / <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftcalc . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftcalc . h <nl> <nl> # define FTCALC_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> + # include " compiler - macros . h " <nl> <nl> FT_BEGIN_HEADER <nl> <nl> FT_BEGIN_HEADER <nl> # define F2DOT14_TO_FIXED ( x ) ( ( FT_Long ) ( x ) * 4 ) / * < < 2 * / <nl> # define FIXED_TO_INT ( x ) ( FT_RoundFix ( x ) > > 16 ) <nl> <nl> - # define ROUND_F26DOT6 ( x ) ( x > = 0 ? ( ( ( x ) + 32 ) & - 64 ) \ <nl> - : ( - ( ( 32 - ( x ) ) & - 64 ) ) ) <nl> + # define ROUND_F26DOT6 ( x ) ( ( ( x ) + 32 - ( x < 0 ) ) & - 64 ) <nl> <nl> / * <nl> * The following macros have two purposes . <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftdebug . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftdebug . h <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> + <nl> + # include " compiler - macros . h " <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> / * defining the enumeration * / <nl> typedef enum FT_Trace_ <nl> { <nl> - # include FT_INTERNAL_TRACE_H <nl> + # include < freetype / internal / fttrace . h > <nl> trace_count <nl> <nl> } FT_Trace ; <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftdrv . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftdrv . h <nl> <nl> # define FTDRV_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> + # include " compiler - macros . h " <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftgloadr . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftgloadr . h <nl> <nl> # define FTGLOADR_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> FT_BASE ( void ) <nl> FT_GlyphLoader_Add ( FT_GlyphLoader loader ) ; <nl> <nl> - / * * / <nl> - <nl> <nl> FT_END_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / fthash . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / fthash . h <nl> <nl> # define FTHASH_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftmemory . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftmemory . h <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_TYPES_H <nl> + # include < freetype / fttypes . h > <nl> <nl> + # include " compiler - macros . h " <nl> <nl> FT_BEGIN_HEADER <nl> <nl> extern " C + + " <nl> # define FT_STRCPYN ( dst , src , size ) \ <nl> ft_mem_strcpyn ( ( char * ) dst , ( const char * ) ( src ) , ( FT_ULong ) ( size ) ) <nl> <nl> - / * * / <nl> - <nl> <nl> FT_END_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftobjs . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftobjs . h <nl> <nl> # ifndef FTOBJS_H_ <nl> # define FTOBJS_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_RENDER_H <nl> - # include FT_SIZES_H <nl> - # include FT_LCD_FILTER_H <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_GLYPH_LOADER_H <nl> - # include FT_INTERNAL_DRIVER_H <nl> - # include FT_INTERNAL_AUTOHINT_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_INTERNAL_CALC_H <nl> + # include < freetype / ftrender . h > <nl> + # include < freetype / ftsizes . h > <nl> + # include < freetype / ftlcdfil . h > <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftgloadr . h > <nl> + # include < freetype / internal / ftdrv . h > <nl> + # include < freetype / internal / autohint . h > <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> <nl> # ifdef FT_CONFIG_OPTION_INCREMENTAL <nl> - # include FT_INCREMENTAL_H <nl> + # include < freetype / ftincrem . h > <nl> # endif <nl> <nl> + # include " compiler - macros . h " <nl> <nl> FT_BEGIN_HEADER <nl> <nl> FT_BEGIN_HEADER <nl> } FT_CMap_ClassRec ; <nl> <nl> <nl> - # define FT_DECLARE_CMAP_CLASS ( class_ ) \ <nl> - FT_CALLBACK_TABLE const FT_CMap_ClassRec class_ ; <nl> + # define FT_DECLARE_CMAP_CLASS ( class_ ) \ <nl> + FT_CALLBACK_TABLE const FT_CMap_ClassRec class_ ; <nl> <nl> # define FT_DEFINE_CMAP_CLASS ( \ <nl> class_ , \ <nl> FT_BEGIN_HEADER <nl> FT_BASE ( void ) <nl> FT_Done_GlyphSlot ( FT_GlyphSlot slot ) ; <nl> <nl> - / * * / <nl> + / * * / <nl> <nl> # define FT_REQUEST_WIDTH ( req ) \ <nl> ( ( req ) - > horiResolution \ <nl> FT_BEGIN_HEADER <nl> * The struct will be allocated in the global scope ( or the scope where <nl> * the macro is used ) . <nl> * / <nl> + # define FT_DECLARE_GLYPH ( class_ ) \ <nl> + FT_CALLBACK_TABLE const FT_Glyph_Class class_ ; <nl> + <nl> # define FT_DEFINE_GLYPH ( \ <nl> class_ , \ <nl> size_ , \ <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftpsprop . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftpsprop . h <nl> <nl> # define FTPSPROP_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftrfork . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftrfork . h <nl> <nl> # define FTRFORK_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftserv . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftserv . h <nl> <nl> # ifndef FTSERV_H_ <nl> # define FTSERV_H_ <nl> <nl> + # include " compiler - macros . h " <nl> <nl> FT_BEGIN_HEADER <nl> <nl> FT_BEGIN_HEADER <nl> <nl> / * * / <nl> <nl> - / * <nl> - * The header files containing the services . <nl> - * / <nl> - <nl> - # define FT_SERVICE_BDF_H < freetype / internal / services / svbdf . h > <nl> - # define FT_SERVICE_CFF_TABLE_LOAD_H < freetype / internal / services / svcfftl . h > <nl> - # define FT_SERVICE_CID_H < freetype / internal / services / svcid . h > <nl> - # define FT_SERVICE_FONT_FORMAT_H < freetype / internal / services / svfntfmt . h > <nl> - # define FT_SERVICE_GLYPH_DICT_H < freetype / internal / services / svgldict . h > <nl> - # define FT_SERVICE_GX_VALIDATE_H < freetype / internal / services / svgxval . h > <nl> - # define FT_SERVICE_KERNING_H < freetype / internal / services / svkern . h > <nl> - # define FT_SERVICE_METRICS_VARIATIONS_H < freetype / internal / services / svmetric . h > <nl> - # define FT_SERVICE_MULTIPLE_MASTERS_H < freetype / internal / services / svmm . h > <nl> - # define FT_SERVICE_OPENTYPE_VALIDATE_H < freetype / internal / services / svotval . h > <nl> - # define FT_SERVICE_PFR_H < freetype / internal / services / svpfr . h > <nl> - # define FT_SERVICE_POSTSCRIPT_CMAPS_H < freetype / internal / services / svpscmap . h > <nl> - # define FT_SERVICE_POSTSCRIPT_INFO_H < freetype / internal / services / svpsinfo . h > <nl> - # define FT_SERVICE_POSTSCRIPT_NAME_H < freetype / internal / services / svpostnm . h > <nl> - # define FT_SERVICE_PROPERTIES_H < freetype / internal / services / svprop . h > <nl> - # define FT_SERVICE_SFNT_H < freetype / internal / services / svsfnt . h > <nl> - # define FT_SERVICE_TRUETYPE_ENGINE_H < freetype / internal / services / svtteng . h > <nl> - # define FT_SERVICE_TRUETYPE_GLYF_H < freetype / internal / services / svttglyf . h > <nl> - # define FT_SERVICE_TT_CMAP_H < freetype / internal / services / svttcmap . h > <nl> - # define FT_SERVICE_WINFNT_H < freetype / internal / services / svwinfnt . h > <nl> - <nl> - / * * / <nl> - <nl> FT_END_HEADER <nl> <nl> # endif / * FTSERV_H_ * / <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftstream . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftstream . h <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_SYSTEM_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftsystem . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / ftvalid . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / ftvalid . h <nl> <nl> # define FTVALID_H_ <nl> <nl> # include < ft2build . h > <nl> - # include FT_CONFIG_STANDARD_LIBRARY_H / * for ft_setjmp and ft_longjmp * / <nl> + # include FT_CONFIG_STANDARD_LIBRARY_H / * for ft_jmpbuf * / <nl> <nl> + # include " compiler - macros . h " <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / psaux . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / psaux . h <nl> <nl> # define PSAUX_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> - # include FT_INTERNAL_HASH_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> - # include FT_INTERNAL_CFF_OBJECTS_TYPES_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / t1types . h > <nl> + # include < freetype / internal / fthash . h > <nl> + # include < freetype / internal / tttypes . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / cfftypes . h > <nl> + # include < freetype / internal / cffotypes . h > <nl> <nl> <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / pshints . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / pshints . h <nl> <nl> # define PSHINTS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_TYPE1_TABLES_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / t1tables . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svbdf . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svbdf . h <nl> <nl> # ifndef SVBDF_H_ <nl> # define SVBDF_H_ <nl> <nl> - # include FT_BDF_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / ftbdf . h > <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svcfftl . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svcfftl . h <nl> <nl> # ifndef SVCFFTL_H_ <nl> # define SVCFFTL_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / cfftypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svcid . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svcid . h <nl> <nl> # ifndef SVCID_H_ <nl> # define SVCID_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svfntfmt . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svfntfmt . h <nl> <nl> # ifndef SVFNTFMT_H_ <nl> # define SVFNTFMT_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svgldict . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svgldict . h <nl> <nl> # ifndef SVGLDICT_H_ <nl> # define SVGLDICT_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svgxval . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svgxval . h <nl> <nl> # ifndef SVGXVAL_H_ <nl> # define SVGXVAL_H_ <nl> <nl> - # include FT_GX_VALIDATE_H <nl> - # include FT_INTERNAL_VALIDATE_H <nl> + # include < freetype / ftgxval . h > <nl> + # include < freetype / internal / ftvalid . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svkern . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svkern . h <nl> <nl> # ifndef SVKERN_H_ <nl> # define SVKERN_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_TRUETYPE_TABLES_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / tttables . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svmetric . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svmetric . h <nl> <nl> # ifndef SVMETRIC_H_ <nl> # define SVMETRIC_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svmm . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svmm . h <nl> <nl> # ifndef SVMM_H_ <nl> # define SVMM_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svotval . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svotval . h <nl> <nl> # ifndef SVOTVAL_H_ <nl> # define SVOTVAL_H_ <nl> <nl> - # include FT_OPENTYPE_VALIDATE_H <nl> - # include FT_INTERNAL_VALIDATE_H <nl> + # include < freetype / ftotval . h > <nl> + # include < freetype / internal / ftvalid . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svpfr . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svpfr . h <nl> <nl> # ifndef SVPFR_H_ <nl> # define SVPFR_H_ <nl> <nl> - # include FT_PFR_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / ftpfr . h > <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> <nl> } ; <nl> <nl> - / * * / <nl> <nl> FT_END_HEADER <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svpostnm . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svpostnm . h <nl> <nl> # ifndef SVPOSTNM_H_ <nl> # define SVPOSTNM_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> + # include < freetype / internal / ftserv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svpscmap . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svpscmap . h <nl> <nl> # ifndef SVPSCMAP_H_ <nl> # define SVPSCMAP_H_ <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svpsinfo . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svpsinfo . h <nl> <nl> # ifndef SVPSINFO_H_ <nl> # define SVPSINFO_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / t1types . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svsfnt . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svsfnt . h <nl> <nl> # ifndef SVSFNT_H_ <nl> # define SVSFNT_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_TRUETYPE_TABLES_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / tttables . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svttcmap . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svttcmap . h <nl> <nl> # ifndef SVTTCMAP_H_ <nl> # define SVTTCMAP_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_TRUETYPE_TABLES_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / tttables . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svtteng . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svtteng . h <nl> <nl> # ifndef SVTTENG_H_ <nl> # define SVTTENG_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_MODULE_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svttglyf . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svttglyf . h <nl> <nl> # ifndef SVTTGLYF_H_ <nl> # define SVTTGLYF_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_TRUETYPE_TABLES_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / tttables . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / services / svwinfnt . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / services / svwinfnt . h <nl> <nl> # ifndef SVWINFNT_H_ <nl> # define SVWINFNT_H_ <nl> <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_WINFONTS_H <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / ftwinfnt . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / sfnt . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / sfnt . h <nl> <nl> # define SFNT_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> - # include FT_INTERNAL_WOFF_TYPES_H <nl> + # include < freetype / internal / ftdrv . h > <nl> + # include < freetype / internal / tttypes . h > <nl> + # include < freetype / internal / wofftypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / t1types . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / t1types . h <nl> <nl> # define T1TYPES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TYPE1_TABLES_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_INTERNAL_HASH_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> + # include < freetype / t1tables . h > <nl> + # include < freetype / internal / pshints . h > <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / fthash . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / internal / tttypes . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / tttypes . h <nl> <nl> # define TTTYPES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TRUETYPE_TABLES_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_COLOR_H <nl> + # include < freetype / tttables . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftcolor . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_MULTIPLE_MASTERS_H <nl> + # include < freetype / ftmm . h > <nl> # endif <nl> <nl> <nl> mmm a / thirdparty / freetype / include / freetype / internal / wofftypes . h <nl> ppp b / thirdparty / freetype / include / freetype / internal / wofftypes . h <nl> <nl> # define WOFFTYPES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TRUETYPE_TABLES_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / tttables . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / t1tables . h <nl> ppp b / thirdparty / freetype / include / freetype / t1tables . h <nl> <nl> # define T1TABLES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / ttnameid . h <nl> ppp b / thirdparty / freetype / include / freetype / ttnameid . h <nl> <nl> # define TTNAMEID_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / include / freetype / tttables . h <nl> ppp b / thirdparty / freetype / include / freetype / tttables . h <nl> <nl> # define TTTABLES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / freetype / tttags . h <nl> ppp b / thirdparty / freetype / include / freetype / tttags . h <nl> <nl> # define TTAGS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / include / ft2build . h <nl> ppp b / thirdparty / freetype / include / ft2build . h <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> * <nl> - * This is the ' entry point ' for FreeType header file inclusions . It is <nl> - * the only header file which should be included directly ; all other <nl> - * FreeType header files should be accessed with macro names ( after <nl> - * including ` ft2build . h ` ) . <nl> + * This is the ' entry point ' for FreeType header file inclusions , to be <nl> + * loaded before all other header files . <nl> * <nl> * A typical example is <nl> * <nl> * ` ` ` <nl> * # include < ft2build . h > <nl> - * # include FT_FREETYPE_H <nl> + * # include < freetype / freetype . h > <nl> * ` ` ` <nl> * <nl> * / <nl> mmm a / thirdparty / freetype / src / autofit / afblue . c <nl> ppp b / thirdparty / freetype / src / autofit / afblue . c <nl> <nl> ' \ 0 ' , <nl> ' \ xF0 ' , ' \ x90 ' , ' \ x90 ' , ' \ xA8 ' , ' ' , ' \ xF0 ' , ' \ x90 ' , ' \ x90 ' , ' \ xAA ' , ' ' , ' \ xF0 ' , ' \ x90 ' , ' \ x90 ' , ' \ xAC ' , ' ' , ' \ xF0 ' , ' \ x90 ' , ' \ x90 ' , ' \ xBF ' , ' ' , ' \ xF0 ' , ' \ x90 ' , ' \ x91 ' , ' \ x83 ' , / * 𐐨 𐐪 𐐬 𐐿 𐑃 * / <nl> ' \ 0 ' , <nl> - ' \ xE0 ' , ' \ xA4 ' , ' \ x95 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xAE ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x85 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x86 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xA5 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xA7 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xAD ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xB6 ' , / * क म अ आ थ ध भ श * / <nl> + ' \ xE0 ' , ' \ xA4 ' , ' \ x95 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xA8 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xAE ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x89 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x9B ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x9F ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xA0 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xA1 ' , / * क न म उ छ ट ठ ड * / <nl> ' \ 0 ' , <nl> ' \ xE0 ' , ' \ xA4 ' , ' \ x88 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x90 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x93 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ x94 ' , ' ' , ' \ xE0 ' , ' \ xA4 ' , ' \ xBF ' , ' ' , ' \ xE0 ' , ' \ xA5 ' , ' \ x80 ' , ' ' , ' \ xE0 ' , ' \ xA5 ' , ' \ x8B ' , ' ' , ' \ xE0 ' , ' \ xA5 ' , ' \ x8C ' , / * ई ऐ ओ औ ि ी ो ौ * / <nl> ' \ 0 ' , <nl> <nl> ' \ 0 ' , <nl> ' \ xE0 ' , ' \ xB4 ' , ' \ x9F ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ xA0 ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ xA7 ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ xB6 ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ x98 ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ x9A ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ xA5 ' , ' ' , ' \ xE0 ' , ' \ xB4 ' , ' \ xB2 ' , / * ട ഠ ധ ശ ഘ ച ഥ ല * / <nl> ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x80 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x81 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x82 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x83 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x8F ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x9A ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x9F ' , / * 𖹀 𖹁 𖹂 𖹃 𖹏 𖹚 𖹟 * / <nl> + ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x80 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x81 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x82 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x83 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x8F ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x9A ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x92 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ x93 ' , / * 𖹀 𖹁 𖹂 𖹃 𖹏 𖹚 𖹒 𖹓 * / <nl> + ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA4 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xAC ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA7 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xB4 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xB6 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xBE ' , / * 𖹤 𖹬 𖹧 𖹴 𖹶 𖹾 * / <nl> + ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA0 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA1 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA2 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xB9 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xB3 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xAE ' , / * 𖹠 𖹡 𖹢 𖹹 𖹳 𖹮 * / <nl> + ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA0 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA1 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA2 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xB3 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xAD ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xBD ' , / * 𖹠 𖹡 𖹢 𖹳 𖹭 𖹽 * / <nl> + ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA5 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA8 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xB9 ' , ' \ xA9 ' , / * 𖹥 𖹨 𖹩 * / <nl> + ' \ 0 ' , <nl> + ' \ xF0 ' , ' \ x96 ' , ' \ xBA ' , ' \ x80 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xBA ' , ' \ x85 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xBA ' , ' \ x88 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xBA ' , ' \ x84 ' , ' ' , ' \ xF0 ' , ' \ x96 ' , ' \ xBA ' , ' \ x8D ' , / * 𖺀 𖺅 𖺈 𖺄 𖺍 * / <nl> + ' \ 0 ' , <nl> ' \ xE1 ' , ' \ xA0 ' , ' \ xB3 ' , ' ' , ' \ xE1 ' , ' \ xA0 ' , ' \ xB4 ' , ' ' , ' \ xE1 ' , ' \ xA0 ' , ' \ xB6 ' , ' ' , ' \ xE1 ' , ' \ xA0 ' , ' \ xBD ' , ' ' , ' \ xE1 ' , ' \ xA1 ' , ' \ x82 ' , ' ' , ' \ xE1 ' , ' \ xA1 ' , ' \ x8A ' , ' ' , ' \ xE2 ' , ' \ x80 ' , ' \ x8D ' , ' \ xE1 ' , ' \ xA1 ' , ' \ xA1 ' , ' \ xE2 ' , ' \ x80 ' , ' \ x8D ' , ' ' , ' \ xE2 ' , ' \ x80 ' , ' \ x8D ' , ' \ xE1 ' , ' \ xA1 ' , ' \ xB3 ' , ' \ xE2 ' , ' \ x80 ' , ' \ x8D ' , / * ᠳ ᠴ ᠶ ᠽ ᡂ ᡊ ᡡ ᡳ * / <nl> ' \ 0 ' , <nl> ' \ xE1 ' , ' \ xA1 ' , ' \ x83 ' , / * ᡃ * / <nl> <nl> { AF_BLUE_STRING_CHAKMA_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_CHAKMA_DESCENDER , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_BOTTOM , 0 } , <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> - AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM , 0 } , <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM , 0 } , <nl> - { AF_BLUE_STRING_MAX , 0 } , <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_BOTTOM , 0 } , <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM , 0 } , <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM , 0 } , <nl> + { AF_BLUE_STRING_MAX , 0 } , <nl> { AF_BLUE_STRING_CARIAN_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> { AF_BLUE_STRING_CARIAN_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> <nl> { AF_BLUE_STRING_HEBREW_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_HEBREW_DESCENDER , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> + { AF_BLUE_STRING_KANNADA_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_KANNADA_BOTTOM , 0 } , <nl> + { AF_BLUE_STRING_MAX , 0 } , <nl> { AF_BLUE_STRING_KAYAH_LI_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> { AF_BLUE_STRING_KAYAH_LI_BOTTOM , 0 } , <nl> <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> { AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> - { AF_BLUE_STRING_KANNADA_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> - { AF_BLUE_STRING_KANNADA_BOTTOM , 0 } , <nl> - { AF_BLUE_STRING_MAX , 0 } , <nl> { AF_BLUE_STRING_LAO_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> { AF_BLUE_STRING_LAO_BOTTOM , 0 } , <nl> <nl> { AF_BLUE_STRING_MALAYALAM_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> { AF_BLUE_STRING_MALAYALAM_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_BOTTOM , 0 } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_F_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_BOTTOM , 0 } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_DESCENDER , 0 } , <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_DIGIT_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_MAX , 0 } , <nl> { AF_BLUE_STRING_MONGOLIAN_TOP_BASE , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> { AF_BLUE_STRING_MONGOLIAN_BOTTOM_BASE , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> <nl> { AF_BLUE_STRING_TELUGU_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> { AF_BLUE_STRING_TELUGU_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> - { AF_BLUE_STRING_TIFINAGH , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> - { AF_BLUE_STRING_TIFINAGH , 0 } , <nl> - { AF_BLUE_STRING_MAX , 0 } , <nl> { AF_BLUE_STRING_THAI_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } , <nl> { AF_BLUE_STRING_THAI_BOTTOM , 0 } , <nl> <nl> { AF_BLUE_STRING_THAI_LARGE_DESCENDER , 0 } , <nl> { AF_BLUE_STRING_THAI_DIGIT_TOP , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> + { AF_BLUE_STRING_TIFINAGH , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> + { AF_BLUE_STRING_TIFINAGH , 0 } , <nl> + { AF_BLUE_STRING_MAX , 0 } , <nl> { AF_BLUE_STRING_VAI_TOP , AF_BLUE_PROPERTY_LATIN_TOP } , <nl> { AF_BLUE_STRING_VAI_BOTTOM , 0 } , <nl> { AF_BLUE_STRING_MAX , 0 } , <nl> mmm a / thirdparty / freetype / src / autofit / afblue . dat <nl> ppp b / thirdparty / freetype / src / autofit / afblue . dat <nl> AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN : <nl> " 𐐨 𐐪 𐐬 𐐿 𐑃 " <nl> <nl> AF_BLUE_STRING_DEVANAGARI_BASE <nl> - " क म अ आ थ ध भ श " <nl> + " क न म उ छ ट ठ ड " <nl> AF_BLUE_STRING_DEVANAGARI_TOP <nl> " ई ऐ ओ औ ि ी ो ौ " <nl> / / note that some fonts have extreme variation in the height of the <nl> AF_BLUE_STRING_ENUM AF_BLUE_STRINGS_ARRAY AF_BLUE_STRING_MAX_LEN : <nl> AF_BLUE_STRING_MALAYALAM_BOTTOM <nl> " ട ഠ ധ ശ ഘ ച ഥ ല " <nl> <nl> + AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_TOP <nl> + " 𖹀 𖹁 𖹂 𖹃 𖹏 𖹚 𖹟 " <nl> + AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_BOTTOM <nl> + " 𖹀 𖹁 𖹂 𖹃 𖹏 𖹚 𖹒 𖹓 " <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_F_TOP <nl> + " 𖹤 𖹬 𖹧 𖹴 𖹶 𖹾 " <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_TOP <nl> + " 𖹠 𖹡 𖹢 𖹹 𖹳 𖹮 " <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_BOTTOM <nl> + " 𖹠 𖹡 𖹢 𖹳 𖹭 𖹽 " <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_DESCENDER <nl> + " 𖹥 𖹨 𖹩 " <nl> + AF_BLUE_STRING_MEDEFAIDRIN_DIGIT_TOP <nl> + " 𖺀 𖺅 𖺈 𖺄 𖺍 " <nl> + <nl> AF_BLUE_STRING_MONGOLIAN_TOP_BASE <nl> " ᠳ ᠴ ᠶ ᠽ ᡂ ᡊ ᡡ ᡳ " <nl> AF_BLUE_STRING_MONGOLIAN_BOTTOM_BASE <nl> AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN : <nl> { AF_BLUE_STRING_MAX , 0 } <nl> <nl> AF_BLUE_STRINGSET_CANS <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_BOTTOM , 0 } <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> - AF_BLUE_PROPERTY_LATIN_X_HEIGHT } <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM , 0 } <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> - { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM , 0 } <nl> - { AF_BLUE_STRING_MAX , 0 } <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_BOTTOM , 0 } <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SMALL_BOTTOM , 0 } <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_CANADIAN_SYLLABICS_SUPS_BOTTOM , 0 } <nl> + { AF_BLUE_STRING_MAX , 0 } <nl> <nl> AF_BLUE_STRINGSET_CARI <nl> { AF_BLUE_STRING_CARIAN_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN : <nl> { AF_BLUE_STRING_HEBREW_DESCENDER , 0 } <nl> { AF_BLUE_STRING_MAX , 0 } <nl> <nl> + AF_BLUE_STRINGSET_KNDA <nl> + { AF_BLUE_STRING_KANNADA_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_KANNADA_BOTTOM , 0 } <nl> + { AF_BLUE_STRING_MAX , 0 } <nl> + <nl> AF_BLUE_STRINGSET_KALI <nl> { AF_BLUE_STRING_KAYAH_LI_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } <nl> AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN : <nl> { AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM , 0 } <nl> { AF_BLUE_STRING_MAX , 0 } <nl> <nl> - AF_BLUE_STRINGSET_KNDA <nl> - { AF_BLUE_STRING_KANNADA_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> - { AF_BLUE_STRING_KANNADA_BOTTOM , 0 } <nl> - { AF_BLUE_STRING_MAX , 0 } <nl> - <nl> AF_BLUE_STRINGSET_LAO <nl> { AF_BLUE_STRING_LAO_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } <nl> AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN : <nl> { AF_BLUE_STRING_MALAYALAM_BOTTOM , 0 } <nl> { AF_BLUE_STRING_MAX , 0 } <nl> <nl> + AF_BLUE_STRINGSET_MEDF <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_BOTTOM , 0 } <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_F_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> + AF_BLUE_PROPERTY_LATIN_X_HEIGHT } <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_BOTTOM , 0 } <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_SMALL_DESCENDER , 0 } <nl> + { AF_BLUE_STRING_MEDEFAIDRIN_DIGIT_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_MAX , 0 } <nl> + <nl> AF_BLUE_STRINGSET_MONG <nl> { AF_BLUE_STRING_MONGOLIAN_TOP_BASE , AF_BLUE_PROPERTY_LATIN_TOP } <nl> { AF_BLUE_STRING_MONGOLIAN_BOTTOM_BASE , 0 } <nl> AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN : <nl> { AF_BLUE_STRING_TELUGU_BOTTOM , 0 } <nl> { AF_BLUE_STRING_MAX , 0 } <nl> <nl> - AF_BLUE_STRINGSET_TFNG <nl> - { AF_BLUE_STRING_TIFINAGH , AF_BLUE_PROPERTY_LATIN_TOP } <nl> - { AF_BLUE_STRING_TIFINAGH , 0 } <nl> - { AF_BLUE_STRING_MAX , 0 } <nl> - <nl> AF_BLUE_STRINGSET_THAI <nl> { AF_BLUE_STRING_THAI_TOP , AF_BLUE_PROPERTY_LATIN_TOP | <nl> AF_BLUE_PROPERTY_LATIN_X_HEIGHT } <nl> AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY AF_BLUE_STRINGSET_MAX_LEN : <nl> { AF_BLUE_STRING_THAI_DIGIT_TOP , 0 } <nl> { AF_BLUE_STRING_MAX , 0 } <nl> <nl> + AF_BLUE_STRINGSET_TFNG <nl> + { AF_BLUE_STRING_TIFINAGH , AF_BLUE_PROPERTY_LATIN_TOP } <nl> + { AF_BLUE_STRING_TIFINAGH , 0 } <nl> + { AF_BLUE_STRING_MAX , 0 } <nl> + <nl> AF_BLUE_STRINGSET_VAII <nl> { AF_BLUE_STRING_VAI_TOP , AF_BLUE_PROPERTY_LATIN_TOP } <nl> { AF_BLUE_STRING_VAI_BOTTOM , 0 } <nl> mmm a / thirdparty / freetype / src / autofit / afblue . h <nl> ppp b / thirdparty / freetype / src / autofit / afblue . h <nl> FT_BEGIN_HEADER <nl> AF_BLUE_STRING_LISU_BOTTOM = 3506 , <nl> AF_BLUE_STRING_MALAYALAM_TOP = 3538 , <nl> AF_BLUE_STRING_MALAYALAM_BOTTOM = 3582 , <nl> - AF_BLUE_STRING_MONGOLIAN_TOP_BASE = 3614 , <nl> - AF_BLUE_STRING_MONGOLIAN_BOTTOM_BASE = 3658 , <nl> - AF_BLUE_STRING_MYANMAR_TOP = 3662 , <nl> - AF_BLUE_STRING_MYANMAR_BOTTOM = 3694 , <nl> - AF_BLUE_STRING_MYANMAR_ASCENDER = 3726 , <nl> - AF_BLUE_STRING_MYANMAR_DESCENDER = 3754 , <nl> - AF_BLUE_STRING_NKO_TOP = 3786 , <nl> - AF_BLUE_STRING_NKO_BOTTOM = 3810 , <nl> - AF_BLUE_STRING_NKO_SMALL_TOP = 3825 , <nl> - AF_BLUE_STRING_NKO_SMALL_BOTTOM = 3834 , <nl> - AF_BLUE_STRING_OL_CHIKI = 3846 , <nl> - AF_BLUE_STRING_OLD_TURKIC_TOP = 3870 , <nl> - AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 3885 , <nl> - AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 3905 , <nl> - AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 3945 , <nl> - AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 3975 , <nl> - AF_BLUE_STRING_OSAGE_SMALL_TOP = 3990 , <nl> - AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 4030 , <nl> - AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 4070 , <nl> - AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 4095 , <nl> - AF_BLUE_STRING_OSMANYA_TOP = 4110 , <nl> - AF_BLUE_STRING_OSMANYA_BOTTOM = 4150 , <nl> - AF_BLUE_STRING_ROHINGYA_TOP = 4190 , <nl> - AF_BLUE_STRING_ROHINGYA_BOTTOM = 4215 , <nl> - AF_BLUE_STRING_ROHINGYA_JOIN = 4240 , <nl> - AF_BLUE_STRING_SAURASHTRA_TOP = 4243 , <nl> - AF_BLUE_STRING_SAURASHTRA_BOTTOM = 4275 , <nl> - AF_BLUE_STRING_SHAVIAN_TOP = 4295 , <nl> - AF_BLUE_STRING_SHAVIAN_BOTTOM = 4305 , <nl> - AF_BLUE_STRING_SHAVIAN_DESCENDER = 4330 , <nl> - AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 4340 , <nl> - AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4375 , <nl> - AF_BLUE_STRING_SINHALA_TOP = 4390 , <nl> - AF_BLUE_STRING_SINHALA_BOTTOM = 4422 , <nl> - AF_BLUE_STRING_SINHALA_DESCENDER = 4454 , <nl> - AF_BLUE_STRING_SUNDANESE_TOP = 4498 , <nl> - AF_BLUE_STRING_SUNDANESE_BOTTOM = 4522 , <nl> - AF_BLUE_STRING_SUNDANESE_DESCENDER = 4554 , <nl> - AF_BLUE_STRING_TAI_VIET_TOP = 4562 , <nl> - AF_BLUE_STRING_TAI_VIET_BOTTOM = 4582 , <nl> - AF_BLUE_STRING_TAMIL_TOP = 4594 , <nl> - AF_BLUE_STRING_TAMIL_BOTTOM = 4626 , <nl> - AF_BLUE_STRING_TELUGU_TOP = 4658 , <nl> - AF_BLUE_STRING_TELUGU_BOTTOM = 4686 , <nl> - AF_BLUE_STRING_THAI_TOP = 4714 , <nl> - AF_BLUE_STRING_THAI_BOTTOM = 4738 , <nl> - AF_BLUE_STRING_THAI_ASCENDER = 4766 , <nl> - AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4778 , <nl> - AF_BLUE_STRING_THAI_DESCENDER = 4790 , <nl> - AF_BLUE_STRING_THAI_LARGE_DESCENDER = 4806 , <nl> - AF_BLUE_STRING_THAI_DIGIT_TOP = 4814 , <nl> - AF_BLUE_STRING_TIFINAGH = 4826 , <nl> - AF_BLUE_STRING_VAI_TOP = 4858 , <nl> - AF_BLUE_STRING_VAI_BOTTOM = 4890 , <nl> - af_blue_1_1 = 4921 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_TOP = 3614 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_CAPITAL_BOTTOM = 3649 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_F_TOP = 3689 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_TOP = 3719 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_BOTTOM = 3749 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_SMALL_DESCENDER = 3779 , <nl> + AF_BLUE_STRING_MEDEFAIDRIN_DIGIT_TOP = 3794 , <nl> + AF_BLUE_STRING_MONGOLIAN_TOP_BASE = 3819 , <nl> + AF_BLUE_STRING_MONGOLIAN_BOTTOM_BASE = 3863 , <nl> + AF_BLUE_STRING_MYANMAR_TOP = 3867 , <nl> + AF_BLUE_STRING_MYANMAR_BOTTOM = 3899 , <nl> + AF_BLUE_STRING_MYANMAR_ASCENDER = 3931 , <nl> + AF_BLUE_STRING_MYANMAR_DESCENDER = 3959 , <nl> + AF_BLUE_STRING_NKO_TOP = 3991 , <nl> + AF_BLUE_STRING_NKO_BOTTOM = 4015 , <nl> + AF_BLUE_STRING_NKO_SMALL_TOP = 4030 , <nl> + AF_BLUE_STRING_NKO_SMALL_BOTTOM = 4039 , <nl> + AF_BLUE_STRING_OL_CHIKI = 4051 , <nl> + AF_BLUE_STRING_OLD_TURKIC_TOP = 4075 , <nl> + AF_BLUE_STRING_OLD_TURKIC_BOTTOM = 4090 , <nl> + AF_BLUE_STRING_OSAGE_CAPITAL_TOP = 4110 , <nl> + AF_BLUE_STRING_OSAGE_CAPITAL_BOTTOM = 4150 , <nl> + AF_BLUE_STRING_OSAGE_CAPITAL_DESCENDER = 4180 , <nl> + AF_BLUE_STRING_OSAGE_SMALL_TOP = 4195 , <nl> + AF_BLUE_STRING_OSAGE_SMALL_BOTTOM = 4235 , <nl> + AF_BLUE_STRING_OSAGE_SMALL_ASCENDER = 4275 , <nl> + AF_BLUE_STRING_OSAGE_SMALL_DESCENDER = 4300 , <nl> + AF_BLUE_STRING_OSMANYA_TOP = 4315 , <nl> + AF_BLUE_STRING_OSMANYA_BOTTOM = 4355 , <nl> + AF_BLUE_STRING_ROHINGYA_TOP = 4395 , <nl> + AF_BLUE_STRING_ROHINGYA_BOTTOM = 4420 , <nl> + AF_BLUE_STRING_ROHINGYA_JOIN = 4445 , <nl> + AF_BLUE_STRING_SAURASHTRA_TOP = 4448 , <nl> + AF_BLUE_STRING_SAURASHTRA_BOTTOM = 4480 , <nl> + AF_BLUE_STRING_SHAVIAN_TOP = 4500 , <nl> + AF_BLUE_STRING_SHAVIAN_BOTTOM = 4510 , <nl> + AF_BLUE_STRING_SHAVIAN_DESCENDER = 4535 , <nl> + AF_BLUE_STRING_SHAVIAN_SMALL_TOP = 4545 , <nl> + AF_BLUE_STRING_SHAVIAN_SMALL_BOTTOM = 4580 , <nl> + AF_BLUE_STRING_SINHALA_TOP = 4595 , <nl> + AF_BLUE_STRING_SINHALA_BOTTOM = 4627 , <nl> + AF_BLUE_STRING_SINHALA_DESCENDER = 4659 , <nl> + AF_BLUE_STRING_SUNDANESE_TOP = 4703 , <nl> + AF_BLUE_STRING_SUNDANESE_BOTTOM = 4727 , <nl> + AF_BLUE_STRING_SUNDANESE_DESCENDER = 4759 , <nl> + AF_BLUE_STRING_TAI_VIET_TOP = 4767 , <nl> + AF_BLUE_STRING_TAI_VIET_BOTTOM = 4787 , <nl> + AF_BLUE_STRING_TAMIL_TOP = 4799 , <nl> + AF_BLUE_STRING_TAMIL_BOTTOM = 4831 , <nl> + AF_BLUE_STRING_TELUGU_TOP = 4863 , <nl> + AF_BLUE_STRING_TELUGU_BOTTOM = 4891 , <nl> + AF_BLUE_STRING_THAI_TOP = 4919 , <nl> + AF_BLUE_STRING_THAI_BOTTOM = 4943 , <nl> + AF_BLUE_STRING_THAI_ASCENDER = 4971 , <nl> + AF_BLUE_STRING_THAI_LARGE_ASCENDER = 4983 , <nl> + AF_BLUE_STRING_THAI_DESCENDER = 4995 , <nl> + AF_BLUE_STRING_THAI_LARGE_DESCENDER = 5011 , <nl> + AF_BLUE_STRING_THAI_DIGIT_TOP = 5019 , <nl> + AF_BLUE_STRING_TIFINAGH = 5031 , <nl> + AF_BLUE_STRING_VAI_TOP = 5063 , <nl> + AF_BLUE_STRING_VAI_BOTTOM = 5095 , <nl> + af_blue_1_1 = 5126 , <nl> # ifdef AF_CONFIG_OPTION_CJK <nl> AF_BLUE_STRING_CJK_TOP = af_blue_1_1 + 1 , <nl> AF_BLUE_STRING_CJK_BOTTOM = af_blue_1_1 + 203 , <nl> FT_BEGIN_HEADER <nl> AF_BLUE_STRINGSET_GUJR = 112 , <nl> AF_BLUE_STRINGSET_GURU = 118 , <nl> AF_BLUE_STRINGSET_HEBR = 124 , <nl> - AF_BLUE_STRINGSET_KALI = 128 , <nl> - AF_BLUE_STRINGSET_KHMR = 134 , <nl> - AF_BLUE_STRINGSET_KHMS = 140 , <nl> - AF_BLUE_STRINGSET_KNDA = 143 , <nl> + AF_BLUE_STRINGSET_KNDA = 128 , <nl> + AF_BLUE_STRINGSET_KALI = 131 , <nl> + AF_BLUE_STRINGSET_KHMR = 137 , <nl> + AF_BLUE_STRINGSET_KHMS = 143 , <nl> AF_BLUE_STRINGSET_LAO = 146 , <nl> AF_BLUE_STRINGSET_LATN = 152 , <nl> AF_BLUE_STRINGSET_LATB = 159 , <nl> AF_BLUE_STRINGSET_LATP = 166 , <nl> AF_BLUE_STRINGSET_LISU = 173 , <nl> AF_BLUE_STRINGSET_MLYM = 176 , <nl> - AF_BLUE_STRINGSET_MONG = 179 , <nl> - AF_BLUE_STRINGSET_MYMR = 182 , <nl> - AF_BLUE_STRINGSET_NKOO = 187 , <nl> - AF_BLUE_STRINGSET_NONE = 192 , <nl> - AF_BLUE_STRINGSET_OLCK = 193 , <nl> - AF_BLUE_STRINGSET_ORKH = 196 , <nl> - AF_BLUE_STRINGSET_OSGE = 199 , <nl> - AF_BLUE_STRINGSET_OSMA = 207 , <nl> - AF_BLUE_STRINGSET_ROHG = 210 , <nl> - AF_BLUE_STRINGSET_SAUR = 214 , <nl> - AF_BLUE_STRINGSET_SHAW = 217 , <nl> - AF_BLUE_STRINGSET_SINH = 223 , <nl> - AF_BLUE_STRINGSET_SUND = 227 , <nl> - AF_BLUE_STRINGSET_TAML = 231 , <nl> - AF_BLUE_STRINGSET_TAVT = 234 , <nl> - AF_BLUE_STRINGSET_TELU = 237 , <nl> - AF_BLUE_STRINGSET_TFNG = 240 , <nl> - AF_BLUE_STRINGSET_THAI = 243 , <nl> - AF_BLUE_STRINGSET_VAII = 251 , <nl> - af_blue_2_1 = 254 , <nl> + AF_BLUE_STRINGSET_MEDF = 179 , <nl> + AF_BLUE_STRINGSET_MONG = 187 , <nl> + AF_BLUE_STRINGSET_MYMR = 190 , <nl> + AF_BLUE_STRINGSET_NKOO = 195 , <nl> + AF_BLUE_STRINGSET_NONE = 200 , <nl> + AF_BLUE_STRINGSET_OLCK = 201 , <nl> + AF_BLUE_STRINGSET_ORKH = 204 , <nl> + AF_BLUE_STRINGSET_OSGE = 207 , <nl> + AF_BLUE_STRINGSET_OSMA = 215 , <nl> + AF_BLUE_STRINGSET_ROHG = 218 , <nl> + AF_BLUE_STRINGSET_SAUR = 222 , <nl> + AF_BLUE_STRINGSET_SHAW = 225 , <nl> + AF_BLUE_STRINGSET_SINH = 231 , <nl> + AF_BLUE_STRINGSET_SUND = 235 , <nl> + AF_BLUE_STRINGSET_TAML = 239 , <nl> + AF_BLUE_STRINGSET_TAVT = 242 , <nl> + AF_BLUE_STRINGSET_TELU = 245 , <nl> + AF_BLUE_STRINGSET_THAI = 248 , <nl> + AF_BLUE_STRINGSET_TFNG = 256 , <nl> + AF_BLUE_STRINGSET_VAII = 259 , <nl> + af_blue_2_1 = 262 , <nl> # ifdef AF_CONFIG_OPTION_CJK <nl> AF_BLUE_STRINGSET_HANI = af_blue_2_1 + 0 , <nl> af_blue_2_1_1 = af_blue_2_1 + 2 , <nl> mmm a / thirdparty / freetype / src / autofit / afcjk . c <nl> ppp b / thirdparty / freetype / src / autofit / afcjk . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_ADVANCES_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / ftadvanc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " afglobal . h " <nl> # include " aflatin . h " <nl> <nl> if ( ! glyph_index ) <nl> goto Exit ; <nl> <nl> - FT_TRACE5 ( ( " standard character : U + % 04lX ( glyph index % d ) \ n " , <nl> + FT_TRACE5 ( ( " standard character : U + % 04lX ( glyph index % ld ) \ n " , <nl> ch , glyph_index ) ) ; <nl> <nl> error = FT_Load_Glyph ( face , glyph_index , FT_LOAD_NO_SCALE ) ; <nl> <nl> dim = = AF_DIMENSION_VERT ? " horizontal " <nl> : " vertical " ) ) ; <nl> <nl> - FT_TRACE5 ( ( " % d ( standard ) " , axis - > standard_width ) ) ; <nl> + FT_TRACE5 ( ( " % ld ( standard ) " , axis - > standard_width ) ) ; <nl> for ( i = 1 ; i < axis - > width_count ; i + + ) <nl> - FT_TRACE5 ( ( " % d " , axis - > widths [ i ] . org ) ) ; <nl> + FT_TRACE5 ( ( " % ld " , axis - > widths [ i ] . org ) ) ; <nl> <nl> FT_TRACE5 ( ( " \ n " ) ) ; <nl> } <nl> <nl> <nl> delta2 = FT_MulFix ( delta2 , scale ) ; <nl> <nl> - FT_TRACE5 ( ( " delta : % d " , delta1 ) ) ; <nl> + FT_TRACE5 ( ( " delta : % ld " , delta1 ) ) ; <nl> if ( delta2 < 32 ) <nl> delta2 = 0 ; <nl> # if 0 <nl> <nl> # endif <nl> else <nl> delta2 = FT_PIX_ROUND ( delta2 ) ; <nl> - FT_TRACE5 ( ( " / % d \ n " , delta2 ) ) ; <nl> + FT_TRACE5 ( ( " / % ld \ n " , delta2 ) ) ; <nl> <nl> if ( delta1 < 0 ) <nl> delta2 = - delta2 ; <nl> <nl> <nl> stem_edge - > pos = base_edge - > pos + fitted_width ; <nl> <nl> - FT_TRACE5 ( ( " CJKLINK : edge % d @ % d ( opos = % . 2f ) linked to % . 2f , " <nl> + FT_TRACE5 ( ( " CJKLINK : edge % ld @ % d ( opos = % . 2f ) linked to % . 2f , " <nl> " dist was % . 2f , now % . 2f \ n " , <nl> stem_edge - hints - > axis [ dim ] . edges , stem_edge - > fpos , <nl> stem_edge - > opos / 64 . 0 , stem_edge - > pos / 64 . 0 , <nl> <nl> continue ; <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> - FT_TRACE5 ( ( " CJKBLUE : edge % d @ % d ( opos = % . 2f ) snapped to % . 2f , " <nl> + FT_TRACE5 ( ( " CJKBLUE : edge % ld @ % d ( opos = % . 2f ) snapped to % . 2f , " <nl> " was % . 2f \ n " , <nl> edge1 - edges , edge1 - > fpos , edge1 - > opos / 64 . 0 , <nl> blue - > fit / 64 . 0 , edge1 - > pos / 64 . 0 ) ) ; <nl> <nl> / * this should not happen , but it ' s better to be safe * / <nl> if ( edge2 - > blue_edge ) <nl> { <nl> - FT_TRACE5 ( ( " ASSERTION FAILED for edge % d \ n " , edge2 - edges ) ) ; <nl> + FT_TRACE5 ( ( " ASSERTION FAILED for edge % ld \ n " , edge2 - edges ) ) ; <nl> <nl> af_cjk_align_linked_edge ( hints , dim , edge2 , edge ) ; <nl> edge - > flags | = AF_EDGE_DONE ; <nl> mmm a / thirdparty / freetype / src / autofit / aferrors . h <nl> ppp b / thirdparty / freetype / src / autofit / aferrors . h <nl> <nl> # ifndef AFERRORS_H_ <nl> # define AFERRORS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX AF_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Autofit <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * AFERRORS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / autofit / afglobal . c <nl> ppp b / thirdparty / freetype / src / autofit / afglobal . c <nl> <nl> # include " afglobal . h " <nl> # include " afranges . h " <nl> # include " afshaper . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> if ( ! ( count % 10 ) ) <nl> FT_TRACE4 ( ( " " ) ) ; <nl> <nl> - FT_TRACE4 ( ( " % d " , idx ) ) ; <nl> + FT_TRACE4 ( ( " % ld " , idx ) ) ; <nl> count + + ; <nl> <nl> if ( ! ( count % 10 ) ) <nl> mmm a / thirdparty / freetype / src / autofit / afhints . c <nl> ppp b / thirdparty / freetype / src / autofit / afhints . c <nl> <nl> <nl> # include " afhints . h " <nl> # include " aferrors . h " <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / autofit / aflatin . c <nl> ppp b / thirdparty / freetype / src / autofit / aflatin . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_ADVANCES_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / ftadvanc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " afglobal . h " <nl> # include " aflatin . h " <nl> <nl> goto Exit ; <nl> } <nl> <nl> - FT_TRACE5 ( ( " standard character : U + % 04lX ( glyph index % d ) \ n " , <nl> + FT_TRACE5 ( ( " standard character : U + % 04lX ( glyph index % ld ) \ n " , <nl> ch , glyph_index ) ) ; <nl> <nl> error = FT_Load_Glyph ( face , glyph_index , FT_LOAD_NO_SCALE ) ; <nl> <nl> dim = = AF_DIMENSION_VERT ? " horizontal " <nl> : " vertical " ) ) ; <nl> <nl> - FT_TRACE5 ( ( " % d ( standard ) " , axis - > standard_width ) ) ; <nl> + FT_TRACE5 ( ( " % ld ( standard ) " , axis - > standard_width ) ) ; <nl> for ( i = 1 ; i < axis - > width_count ; i + + ) <nl> - FT_TRACE5 ( ( " % d " , axis - > widths [ i ] . org ) ) ; <nl> + FT_TRACE5 ( ( " % ld " , axis - > widths [ i ] . org ) ) ; <nl> <nl> FT_TRACE5 ( ( " \ n " ) ) ; <nl> } <nl> <nl> { <nl> * a = * b ; <nl> FT_TRACE5 ( ( " blue zone overlap : " <nl> - " adjusting % s % d to % ld \ n " , <nl> + " adjusting % s % ld to % ld \ n " , <nl> a_is_top ? " overshoot " : " reference " , <nl> blue_sorted [ i ] - axis - > blues , <nl> * a ) ) ; <nl> <nl> " af_latin_metrics_scale_dim : " <nl> " x height alignment ( style ` % s ' ) : \ n " <nl> " " <nl> - " vertical scaling changed from % . 5f to % . 5f ( by % d % % ) \ n " <nl> + " vertical scaling changed from % . 5f to % . 5f ( by % ld % % ) \ n " <nl> " \ n " , <nl> af_style_names [ metrics - > root . style_class - > style ] , <nl> scale / 65536 . 0 , <nl> <nl> width - > cur = FT_MulFix ( width - > org , scale ) ; <nl> width - > fit = width - > cur ; <nl> <nl> - FT_TRACE5 ( ( " % d scaled to % . 2f \ n " , <nl> + FT_TRACE5 ( ( " % ld scaled to % . 2f \ n " , <nl> width - > org , <nl> width - > cur / 64 . 0 ) ) ; <nl> } <nl> <nl> AF_LatinBlue blue = & axis - > blues [ nn ] ; <nl> <nl> <nl> - FT_TRACE5 ( ( " reference % d : % d scaled to % . 2f % s \ n " <nl> - " overshoot % d : % d scaled to % . 2f % s \ n " , <nl> + FT_TRACE5 ( ( " reference % d : % ld scaled to % . 2f % s \ n " <nl> + " overshoot % d : % ld scaled to % . 2f % s \ n " , <nl> nn , <nl> blue - > ref . org , <nl> blue - > ref . fit / 64 . 0 , <nl> <nl> <nl> stem_edge - > pos = base_edge - > pos + fitted_width ; <nl> <nl> - FT_TRACE5 ( ( " LINK : edge % d ( opos = % . 2f ) linked to % . 2f , " <nl> + FT_TRACE5 ( ( " LINK : edge % ld ( opos = % . 2f ) linked to % . 2f , " <nl> " dist was % . 2f , now % . 2f \ n " , <nl> stem_edge - hints - > axis [ dim ] . edges , stem_edge - > opos / 64 . 0 , <nl> stem_edge - > pos / 64 . 0 , dist / 64 . 0 , fitted_width / 64 . 0 ) ) ; <nl> <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> if ( ! anchor ) <nl> - FT_TRACE5 ( ( " BLUE_ANCHOR : edge % d ( opos = % . 2f ) snapped to % . 2f , " <nl> - " was % . 2f ( anchor = edge % d ) \ n " , <nl> + FT_TRACE5 ( ( " BLUE_ANCHOR : edge % ld ( opos = % . 2f ) snapped to % . 2f , " <nl> + " was % . 2f ( anchor = edge % ld ) \ n " , <nl> edge1 - edges , edge1 - > opos / 64 . 0 , blue - > fit / 64 . 0 , <nl> edge1 - > pos / 64 . 0 , edge - edges ) ) ; <nl> else <nl> - FT_TRACE5 ( ( " BLUE : edge % d ( opos = % . 2f ) snapped to % . 2f , " <nl> + FT_TRACE5 ( ( " BLUE : edge % ld ( opos = % . 2f ) snapped to % . 2f , " <nl> " was % . 2f \ n " , <nl> edge1 - edges , edge1 - > opos / 64 . 0 , blue - > fit / 64 . 0 , <nl> edge1 - > pos / 64 . 0 ) ) ; <nl> <nl> / * this should not happen , but it ' s better to be safe * / <nl> if ( edge2 - > blue_edge ) <nl> { <nl> - FT_TRACE5 ( ( " ASSERTION FAILED for edge % d \ n " , edge2 - edges ) ) ; <nl> + FT_TRACE5 ( ( " ASSERTION FAILED for edge % ld \ n " , edge2 - edges ) ) ; <nl> <nl> af_latin_align_linked_edge ( hints , dim , edge2 , edge ) ; <nl> edge - > flags | = AF_EDGE_DONE ; <nl> <nl> anchor = edge ; <nl> edge - > flags | = AF_EDGE_DONE ; <nl> <nl> - FT_TRACE5 ( ( " ANCHOR : edge % d ( opos = % . 2f ) and % d ( opos = % . 2f ) " <nl> + FT_TRACE5 ( ( " ANCHOR : edge % ld ( opos = % . 2f ) and % ld ( opos = % . 2f ) " <nl> " snapped to % . 2f and % . 2f \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , <nl> edge2 - edges , edge2 - > opos / 64 . 0 , <nl> <nl> <nl> if ( edge2 - > flags & AF_EDGE_DONE ) <nl> { <nl> - FT_TRACE5 ( ( " ADJUST : edge % d ( pos = % . 2f ) moved to % . 2f \ n " , <nl> + FT_TRACE5 ( ( " ADJUST : edge % ld ( pos = % . 2f ) moved to % . 2f \ n " , <nl> edge - edges , edge - > pos / 64 . 0 , <nl> ( edge2 - > pos - cur_len ) / 64 . 0 ) ) ; <nl> <nl> <nl> edge - > pos = cur_pos1 - cur_len / 2 ; <nl> edge2 - > pos = cur_pos1 + cur_len / 2 ; <nl> <nl> - FT_TRACE5 ( ( " STEM : edge % d ( opos = % . 2f ) linked to % d ( opos = % . 2f ) " <nl> + FT_TRACE5 ( ( " STEM : edge % ld ( opos = % . 2f ) linked to % ld ( opos = % . 2f ) " <nl> " snapped to % . 2f and % . 2f \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , <nl> edge2 - edges , edge2 - > opos / 64 . 0 , <nl> <nl> edge - > pos = ( delta1 < delta2 ) ? cur_pos1 : cur_pos2 ; <nl> edge2 - > pos = edge - > pos + cur_len ; <nl> <nl> - FT_TRACE5 ( ( " STEM : edge % d ( opos = % . 2f ) linked to % d ( opos = % . 2f ) " <nl> + FT_TRACE5 ( ( " STEM : edge % ld ( opos = % . 2f ) linked to % ld ( opos = % . 2f ) " <nl> " snapped to % . 2f and % . 2f \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , <nl> edge2 - edges , edge2 - > opos / 64 . 0 , <nl> <nl> if ( edge - > link & & FT_ABS ( edge - > link - > pos - edge [ - 1 ] . pos ) > 16 ) <nl> { <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> - FT_TRACE5 ( ( " BOUND : edge % d ( pos = % . 2f ) moved to % . 2f \ n " , <nl> + FT_TRACE5 ( ( " BOUND : edge % ld ( pos = % . 2f ) moved to % . 2f \ n " , <nl> edge - edges , <nl> edge - > pos / 64 . 0 , <nl> edge [ - 1 ] . pos / 64 . 0 ) ) ; <nl> <nl> if ( delta < 64 + 16 ) <nl> { <nl> af_latin_align_serif_edge ( hints , edge - > serif , edge ) ; <nl> - FT_TRACE5 ( ( " SERIF : edge % d ( opos = % . 2f ) serif to % d ( opos = % . 2f ) " <nl> + FT_TRACE5 ( ( " SERIF : edge % ld ( opos = % . 2f ) serif to % ld ( opos = % . 2f ) " <nl> " aligned to % . 2f \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , <nl> edge - > serif - edges , edge - > serif - > opos / 64 . 0 , <nl> <nl> { <nl> edge - > pos = FT_PIX_ROUND ( edge - > opos ) ; <nl> anchor = edge ; <nl> - FT_TRACE5 ( ( " SERIF_ANCHOR : edge % d ( opos = % . 2f ) " <nl> + FT_TRACE5 ( ( " SERIF_ANCHOR : edge % ld ( opos = % . 2f ) " <nl> " snapped to % . 2f \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , edge - > pos / 64 . 0 ) ) ; <nl> } <nl> <nl> after - > pos - before - > pos , <nl> after - > opos - before - > opos ) ; <nl> <nl> - FT_TRACE5 ( ( " SERIF_LINK1 : edge % d ( opos = % . 2f ) snapped to % . 2f " <nl> - " from % d ( opos = % . 2f ) \ n " , <nl> + FT_TRACE5 ( ( " SERIF_LINK1 : edge % ld ( opos = % . 2f ) snapped to % . 2f " <nl> + " from % ld ( opos = % . 2f ) \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , <nl> edge - > pos / 64 . 0 , <nl> before - edges , before - > opos / 64 . 0 ) ) ; <nl> <nl> { <nl> edge - > pos = anchor - > pos + <nl> ( ( edge - > opos - anchor - > opos + 16 ) & ~ 31 ) ; <nl> - FT_TRACE5 ( ( " SERIF_LINK2 : edge % d ( opos = % . 2f ) " <nl> + FT_TRACE5 ( ( " SERIF_LINK2 : edge % ld ( opos = % . 2f ) " <nl> " snapped to % . 2f \ n " , <nl> edge - edges , edge - > opos / 64 . 0 , edge - > pos / 64 . 0 ) ) ; <nl> } <nl> <nl> if ( edge - > link & & FT_ABS ( edge - > link - > pos - edge [ - 1 ] . pos ) > 16 ) <nl> { <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> - FT_TRACE5 ( ( " BOUND : edge % d ( pos = % . 2f ) moved to % . 2f \ n " , <nl> + FT_TRACE5 ( ( " BOUND : edge % ld ( pos = % . 2f ) moved to % . 2f \ n " , <nl> edge - edges , <nl> edge - > pos / 64 . 0 , <nl> edge [ - 1 ] . pos / 64 . 0 ) ) ; <nl> <nl> if ( edge - > link & & FT_ABS ( edge - > link - > pos - edge [ - 1 ] . pos ) > 16 ) <nl> { <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> - FT_TRACE5 ( ( " BOUND : edge % d ( pos = % . 2f ) moved to % . 2f \ n " , <nl> + FT_TRACE5 ( ( " BOUND : edge % ld ( pos = % . 2f ) moved to % . 2f \ n " , <nl> edge - edges , <nl> edge - > pos / 64 . 0 , <nl> edge [ 1 ] . pos / 64 . 0 ) ) ; <nl> mmm a / thirdparty / freetype / src / autofit / aflatin2 . c <nl> ppp b / thirdparty / freetype / src / autofit / aflatin2 . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_ADVANCES_H <nl> + # include < freetype / ftadvanc . h > <nl> <nl> <nl> # ifdef FT_OPTION_AUTOFIT2 <nl> mmm a / thirdparty / freetype / src / autofit / afloader . c <nl> ppp b / thirdparty / freetype / src / autofit / afloader . c <nl> <nl> # include " aferrors . h " <nl> # include " afmodule . h " <nl> <nl> - # include FT_INTERNAL_CALC_H <nl> + # include < freetype / internal / ftcalc . h > <nl> <nl> <nl> / * Initialize glyph loader . * / <nl> mmm a / thirdparty / freetype / src / autofit / afmodule . c <nl> ppp b / thirdparty / freetype / src / autofit / afmodule . c <nl> <nl> void * _af_debug_hints = _af_debug_hints_rec ; <nl> # endif <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_DRIVER_H <nl> - # include FT_SERVICE_PROPERTIES_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftdriver . h > <nl> + # include < freetype / internal / services / svprop . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> if ( ! af_style_classes [ ss ] ) <nl> { <nl> FT_TRACE0 ( ( " af_property_set : Invalid value % d for property ` % s ' \ n " , <nl> - fallback_script , property_name ) ) ; <nl> + * fallback_script , property_name ) ) ; <nl> return FT_THROW ( Invalid_Argument ) ; <nl> } <nl> <nl> <nl> NULL , / * reset_face * / <nl> NULL , / * get_global_hints * / <nl> NULL , / * done_global_hints * / <nl> - ( FT_AutoHinter_GlyphLoadFunc ) af_autofitter_load_glyph ) / * load_glyph * / <nl> - <nl> + ( FT_AutoHinter_GlyphLoadFunc ) af_autofitter_load_glyph / * load_glyph * / <nl> + ) <nl> <nl> FT_DEFINE_MODULE ( <nl> autofit_module_class , <nl> mmm a / thirdparty / freetype / src / autofit / afmodule . h <nl> ppp b / thirdparty / freetype / src / autofit / afmodule . h <nl> <nl> # ifndef AFMODULE_H_ <nl> # define AFMODULE_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_MODULE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> } AF_ModuleRec , * AF_Module ; <nl> <nl> <nl> + FT_DECLARE_AUTOHINTER_INTERFACE ( af_autofitter_interface ) <nl> FT_DECLARE_MODULE ( autofit_module_class ) <nl> <nl> <nl> mmm a / thirdparty / freetype / src / autofit / afranges . c <nl> ppp b / thirdparty / freetype / src / autofit / afranges . c <nl> <nl> } ; <nl> <nl> <nl> + const AF_Script_UniRangeRec af_medf_uniranges [ ] = <nl> + { <nl> + AF_UNIRANGE_REC ( 0x16E40 , 0x16E9F ) , / * Medefaidrin * / <nl> + AF_UNIRANGE_REC ( 0 , 0 ) <nl> + } ; <nl> + <nl> + const AF_Script_UniRangeRec af_medf_nonbase_uniranges [ ] = <nl> + { <nl> + AF_UNIRANGE_REC ( 0 , 0 ) <nl> + } ; <nl> + <nl> + <nl> const AF_Script_UniRangeRec af_mong_uniranges [ ] = <nl> { <nl> AF_UNIRANGE_REC ( 0x1800 , 0x18AF ) , / * Mongolian * / <nl> mmm a / thirdparty / freetype / src / autofit / afscript . h <nl> ppp b / thirdparty / freetype / src / autofit / afscript . h <nl> <nl> HINTING_BOTTOM_TO_TOP , <nl> " \ xE0 \ xB4 \ xA0 \ xE0 \ xB4 \ xB1 " ) / * ഠ റ * / <nl> <nl> + SCRIPT ( medf , MEDF , <nl> + " Medefaidrin " , <nl> + HB_SCRIPT_MEDEFAIDRIN , <nl> + HINTING_BOTTOM_TO_TOP , <nl> + " \ xF0 \ x96 \ xB9 \ xA1 \ xF0 \ x96 \ xB9 \ x9B \ xF0 \ x96 \ xB9 \ xAF " ) / * 𖹡 𖹛 𖹯 * / <nl> + <nl> SCRIPT ( mong , MONG , <nl> " Mongolian " , <nl> HB_SCRIPT_MONGOLIAN , <nl> mmm a / thirdparty / freetype / src / autofit / afshaper . c <nl> ppp b / thirdparty / freetype / src / autofit / afshaper . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_ADVANCES_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftadvanc . h > <nl> # include " afglobal . h " <nl> # include " aftypes . h " <nl> # include " afshaper . h " <nl> mmm a / thirdparty / freetype / src / autofit / afshaper . h <nl> ppp b / thirdparty / freetype / src / autofit / afshaper . h <nl> <nl> # define AFSHAPER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> <nl> # ifdef FT_CONFIG_OPTION_USE_HARFBUZZ <nl> mmm a / thirdparty / freetype / src / autofit / afstyles . h <nl> ppp b / thirdparty / freetype / src / autofit / afstyles . h <nl> <nl> AF_BLUE_STRINGSET_MLYM , <nl> AF_COVERAGE_DEFAULT ) <nl> <nl> + STYLE ( medf_dflt , MEDF_DFLT , <nl> + " Medefaidrin default style " , <nl> + AF_WRITING_SYSTEM_LATIN , <nl> + AF_SCRIPT_MEDF , <nl> + AF_BLUE_STRINGSET_MEDF , <nl> + AF_COVERAGE_DEFAULT ) <nl> + <nl> STYLE ( mong_dflt , MONG_DFLT , <nl> " Mongolian default style " , <nl> AF_WRITING_SYSTEM_LATIN , <nl> mmm a / thirdparty / freetype / src / autofit / aftypes . h <nl> ppp b / thirdparty / freetype / src / autofit / aftypes . h <nl> <nl> # ifndef AFTYPES_H_ <nl> # define AFTYPES_H_ <nl> <nl> - # include < ft2build . h > <nl> <nl> - # include FT_FREETYPE_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " afblue . h " <nl> <nl> mmm a / thirdparty / freetype / src / autofit / autofit . c <nl> ppp b / thirdparty / freetype / src / autofit / autofit . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " afangles . c " <nl> # include " afblue . c " <nl> mmm a / thirdparty / freetype / src / base / ftadvanc . c <nl> ppp b / thirdparty / freetype / src / base / ftadvanc . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_ADVANCES_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftadvanc . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> static FT_Error <nl> mmm a / thirdparty / freetype / src / base / ftbase . c <nl> ppp b / thirdparty / freetype / src / base / ftbase . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> <nl> # include " ftadvanc . c " <nl> mmm a / thirdparty / freetype / src / base / ftbase . h <nl> ppp b / thirdparty / freetype / src / base / ftbase . h <nl> <nl> # define FTBASE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> <nl> <nl> + FT_DECLARE_GLYPH ( ft_bitmap_glyph_class ) <nl> + FT_DECLARE_GLYPH ( ft_outline_glyph_class ) <nl> + <nl> + <nl> # ifdef FT_CONFIG_OPTION_MAC_FONTS <nl> <nl> / * MacOS resource fork cannot exceed 16MB at least for Carbon code ; * / <nl> mmm a / thirdparty / freetype / src / base / ftbbox . c <nl> ppp b / thirdparty / freetype / src / base / ftbbox . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - <nl> - # include FT_BBOX_H <nl> - # include FT_IMAGE_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + <nl> + # include < freetype / ftbbox . h > <nl> + # include < freetype / ftimage . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> typedef struct TBBox_Rec_ <nl> mmm a / thirdparty / freetype / src / base / ftbdf . c <nl> ppp b / thirdparty / freetype / src / base / ftbdf . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_BDF_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svbdf . h > <nl> <nl> <nl> / * documentation is in ftbdf . h * / <nl> mmm a / thirdparty / freetype / src / base / ftbitmap . c <nl> ppp b / thirdparty / freetype / src / base / ftbitmap . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_BITMAP_H <nl> - # include FT_IMAGE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftbitmap . h > <nl> + # include < freetype / ftimage . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> FT_TRACE5 ( ( " FT_Bitmap_Blend : \ n " <nl> - " source bitmap : ( % d , % d ) - - ( % d , % d ) ; % d x % d \ n " , <nl> + " source bitmap : ( % ld , % ld ) - - ( % ld , % ld ) ; % d x % d \ n " , <nl> source_llx / 64 , source_lly / 64 , <nl> source_urx / 64 , source_ury / 64 , <nl> source_ - > width , source_ - > rows ) ) ; <nl> <nl> if ( target - > width & & target - > rows ) <nl> - FT_TRACE5 ( ( " target bitmap : ( % d , % d ) - - ( % d , % d ) ; % d x % d \ n " , <nl> + FT_TRACE5 ( ( " target bitmap : ( % ld , % ld ) - - ( % ld , % ld ) ; % d x % d \ n " , <nl> target_llx / 64 , target_lly / 64 , <nl> target_urx / 64 , target_ury / 64 , <nl> target - > width , target - > rows ) ) ; <nl> <nl> FT_TRACE5 ( ( " target bitmap : empty \ n " ) ) ; <nl> <nl> if ( final_width & & final_rows ) <nl> - FT_TRACE5 ( ( " final bitmap : ( % d , % d ) - - ( % d , % d ) ; % d x % d \ n " , <nl> + FT_TRACE5 ( ( " final bitmap : ( % ld , % ld ) - - ( % ld , % ld ) ; % d x % d \ n " , <nl> final_llx / 64 , final_lly / 64 , <nl> final_urx / 64 , final_ury / 64 , <nl> final_width , final_rows ) ) ; <nl> mmm a / thirdparty / freetype / src / base / ftcalc . c <nl> ppp b / thirdparty / freetype / src / base / ftcalc . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_GLYPH_H <nl> - # include FT_TRIGONOMETRY_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftglyph . h > <nl> + # include < freetype / fttrigon . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> # ifdef FT_MULFIX_ASSEMBLER <nl> mmm a / thirdparty / freetype / src / base / ftcid . c <nl> ppp b / thirdparty / freetype / src / base / ftcid . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CID_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_CID_H <nl> + # include < freetype / ftcid . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svcid . h > <nl> <nl> <nl> / * documentation is in ftcid . h * / <nl> mmm a / thirdparty / freetype / src / base / ftcolor . c <nl> ppp b / thirdparty / freetype / src / base / ftcolor . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> - # include FT_COLOR_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / tttypes . h > <nl> + # include < freetype / ftcolor . h > <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_COLOR_LAYERS <nl> mmm a / thirdparty / freetype / src / base / ftdbgmem . c <nl> ppp b / thirdparty / freetype / src / base / ftdbgmem . c <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_SYSTEM_H <nl> - # include FT_ERRORS_H <nl> - # include FT_TYPES_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / ftsystem . h > <nl> + # include < freetype / fterrors . h > <nl> + # include < freetype / fttypes . h > <nl> <nl> <nl> # ifdef FT_DEBUG_MEMORY <nl> mmm a / thirdparty / freetype / src / base / ftdebug . c <nl> ppp b / thirdparty / freetype / src / base / ftdebug . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> <nl> # ifdef FT_DEBUG_LEVEL_ERROR <nl> <nl> <nl> static const char * ft_trace_toggles [ trace_count + 1 ] = <nl> { <nl> - # include FT_INTERNAL_TRACE_H <nl> + # include < freetype / internal / fttrace . h > <nl> NULL <nl> } ; <nl> <nl> mmm a / thirdparty / freetype / src / base / fterrors . c <nl> ppp b / thirdparty / freetype / src / base / fterrors . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_ERRORS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / fterrors . h > <nl> <nl> <nl> / * documentation is in fterrors . h * / <nl> <nl> # define FT_ERRORDEF ( e , v , s ) case v : return s ; <nl> # define FT_ERROR_END_LIST } <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * defined ( FT_CONFIG_OPTION_ERROR_STRINGS ) | | . . . * / <nl> <nl> mmm a / thirdparty / freetype / src / base / ftfntfmt . c <nl> ppp b / thirdparty / freetype / src / base / ftfntfmt . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FONT_FORMATS_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> + # include < freetype / ftfntfmt . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> <nl> <nl> / * documentation is in ftfntfmt . h * / <nl> mmm a / thirdparty / freetype / src / base / ftfstype . c <nl> ppp b / thirdparty / freetype / src / base / ftfstype . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TYPE1_TABLES_H <nl> - # include FT_TRUETYPE_TABLES_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_SERVICE_POSTSCRIPT_INFO_H <nl> + # include < freetype / t1tables . h > <nl> + # include < freetype / tttables . h > <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / services / svpsinfo . h > <nl> <nl> <nl> / * documentation is in freetype . h * / <nl> mmm a / thirdparty / freetype / src / base / ftgasp . c <nl> ppp b / thirdparty / freetype / src / base / ftgasp . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_GASP_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / ftgasp . h > <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_EXPORT_DEF ( FT_Int ) <nl> mmm a / thirdparty / freetype / src / base / ftgloadr . c <nl> ppp b / thirdparty / freetype / src / base / ftgloadr . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_GLYPH_LOADER_H <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftgloadr . h > <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> # undef FT_COMPONENT <nl> # define FT_COMPONENT gloader <nl> <nl> <nl> base - > outline . n_points = 0 ; <nl> base - > outline . n_contours = 0 ; <nl> + base - > outline . flags = 0 ; <nl> base - > num_subglyphs = 0 ; <nl> <nl> * current = * base ; <nl> mmm a / thirdparty / freetype / src / base / ftglyph . c <nl> ppp b / thirdparty / freetype / src / base / ftglyph . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_GLYPH_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_BITMAP_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftglyph . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftbitmap . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + <nl> + # include " ftbase . h " <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / ftgxval . c <nl> ppp b / thirdparty / freetype / src / base / ftgxval . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_GX_VALIDATE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svgxval . h > <nl> <nl> <nl> / * documentation is in ftgxval . h * / <nl> mmm a / thirdparty / freetype / src / base / fthash . c <nl> ppp b / thirdparty / freetype / src / base / fthash . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_HASH_H <nl> - # include FT_INTERNAL_MEMORY_H <nl> + # include < freetype / internal / fthash . h > <nl> + # include < freetype / internal / ftmemory . h > <nl> <nl> <nl> # define INITIAL_HT_SIZE 241 <nl> mmm a / thirdparty / freetype / src / base / ftinit . c <nl> ppp b / thirdparty / freetype / src / base / ftinit . c <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_MODULE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / ftlcdfil . c <nl> ppp b / thirdparty / freetype / src / base / ftlcdfil . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_LCD_FILTER_H <nl> - # include FT_IMAGE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftlcdfil . h > <nl> + # include < freetype / ftimage . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> # ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING <nl> mmm a / thirdparty / freetype / src / base / ftmac . c <nl> ppp b / thirdparty / freetype / src / base / ftmac . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / ftstream . h > <nl> # include " ftbase . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / base / ftmm . c <nl> ppp b / thirdparty / freetype / src / base / ftmm . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_METRICS_VARIATIONS_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svmm . h > <nl> + # include < freetype / internal / services / svmetric . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / ftobjs . c <nl> ppp b / thirdparty / freetype / src / base / ftobjs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_LIST_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_FONT_FORMATS_H <nl> - <nl> - # include FT_INTERNAL_VALIDATE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_RFORK_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H / * for SFNT_Load_Table_Func * / <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H / * for PS_Driver * / <nl> - <nl> - # include FT_TRUETYPE_TABLES_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_TRUETYPE_IDS_H <nl> - <nl> - # include FT_SERVICE_PROPERTIES_H <nl> - # include FT_SERVICE_SFNT_H <nl> - # include FT_SERVICE_POSTSCRIPT_NAME_H <nl> - # include FT_SERVICE_GLYPH_DICT_H <nl> - # include FT_SERVICE_TT_CMAP_H <nl> - # include FT_SERVICE_KERNING_H <nl> - # include FT_SERVICE_TRUETYPE_ENGINE_H <nl> - <nl> - # include FT_DRIVER_H <nl> + # include < freetype / ftlist . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftfntfmt . h > <nl> + <nl> + # include < freetype / internal / ftvalid . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftrfork . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > / * for SFNT_Load_Table_Func * / <nl> + # include < freetype / internal / psaux . h > / * for PS_Driver * / <nl> + <nl> + # include < freetype / tttables . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ttnameid . h > <nl> + <nl> + # include < freetype / internal / services / svprop . h > <nl> + # include < freetype / internal / services / svsfnt . h > <nl> + # include < freetype / internal / services / svpostnm . h > <nl> + # include < freetype / internal / services / svgldict . h > <nl> + # include < freetype / internal / services / svttcmap . h > <nl> + # include < freetype / internal / services / svkern . h > <nl> + # include < freetype / internal / services / svtteng . h > <nl> + <nl> + # include < freetype / ftdriver . h > <nl> <nl> # ifdef FT_CONFIG_OPTION_MAC_FONTS <nl> # include " ftbase . h " <nl> <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> <nl> - # include FT_BITMAP_H <nl> + # include < freetype / ftbitmap . h > <nl> <nl> # if defined ( _MSC_VER ) / * Visual C + + ( and Intel C + + ) * / <nl> / * We disable the warning ` conversion from XXX to YYY , * / <nl> <nl> slot - > linearHoriAdvance / 65536 . 0 ) ) ; <nl> FT_TRACE5 ( ( " linear y advance : % f \ n " , <nl> slot - > linearVertAdvance / 65536 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " \ n " ) ) ; <nl> FT_TRACE5 ( ( " bitmap % dx % d , % s ( mode % d ) \ n " , <nl> slot - > bitmap . width , <nl> slot - > bitmap . rows , <nl> pixel_modes [ slot - > bitmap . pixel_mode ] , <nl> slot - > bitmap . pixel_mode ) ) ; <nl> + FT_TRACE5 ( ( " \ n " ) ) ; <nl> + <nl> + { <nl> + FT_Glyph_Metrics * metrics = & slot - > metrics ; <nl> + <nl> + <nl> + FT_TRACE5 ( ( " metrics : \ n " ) ) ; <nl> + FT_TRACE5 ( ( " width : % f \ n " , metrics - > width / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " height : % f \ n " , metrics - > height / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " \ n " ) ) ; <nl> + FT_TRACE5 ( ( " horiBearingX : % f \ n " , metrics - > horiBearingX / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " horiBearingY : % f \ n " , metrics - > horiBearingY / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " horiAdvance : % f \ n " , metrics - > horiAdvance / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " \ n " ) ) ; <nl> + FT_TRACE5 ( ( " vertBearingX : % f \ n " , metrics - > vertBearingX / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " vertBearingY : % f \ n " , metrics - > vertBearingY / 64 . 0 ) ) ; <nl> + FT_TRACE5 ( ( " vertAdvance : % f \ n " , metrics - > vertAdvance / 64 . 0 ) ) ; <nl> + } <nl> # endif <nl> <nl> Exit : <nl> <nl> / * FT2 allocator takes signed long buffer length , <nl> * too large value causing overflow should be checked <nl> * / <nl> - FT_TRACE4 ( ( " POST fragment # % d : length = 0x % 08x " <nl> - " total pfb_len = 0x % 08x \ n " , <nl> + FT_TRACE4 ( ( " POST fragment # % d : length = 0x % 08lx " <nl> + " total pfb_len = 0x % 08lx \ n " , <nl> i , temp , pfb_len + temp + 6 ) ) ; <nl> <nl> if ( FT_MAC_RFORK_MAX_LEN < temp | | <nl> FT_MAC_RFORK_MAX_LEN - temp < pfb_len + 6 ) <nl> { <nl> FT_TRACE2 ( ( " MacOS resource length cannot exceed " <nl> - " 0x % 08x \ n " , <nl> + " 0x % 08lx \ n " , <nl> FT_MAC_RFORK_MAX_LEN ) ) ; <nl> <nl> error = FT_THROW ( Invalid_Offset ) ; <nl> <nl> } <nl> <nl> FT_TRACE2 ( ( " total buffer size to concatenate " <nl> - " % d POST fragments : 0x % 08x \ n " , <nl> + " % ld POST fragments : 0x % 08lx \ n " , <nl> resource_cnt , pfb_len + 2 ) ) ; <nl> <nl> if ( pfb_len + 2 < 6 ) <nl> { <nl> FT_TRACE2 ( ( " too long fragment length makes " <nl> - " pfb_len confused : pfb_len = 0x % 08x \ n " , <nl> + " pfb_len confused : pfb_len = 0x % 08lx \ n " , <nl> pfb_len ) ) ; <nl> <nl> error = FT_THROW ( Array_Too_Large ) ; <nl> <nl> goto Exit2 ; <nl> <nl> FT_TRACE3 ( ( " POST fragment [ % d ] : " <nl> - " offsets = 0x % 08x , rlen = 0x % 08x , flags = 0x % 04x \ n " , <nl> + " offsets = 0x % 08lx , rlen = 0x % 08lx , flags = 0x % 04x \ n " , <nl> i , offsets [ i ] , rlen , flags ) ) ; <nl> <nl> error = FT_ERR ( Array_Too_Large ) ; <nl> <nl> else <nl> { <nl> FT_TRACE3 ( ( " Write POST fragment # % d header ( 4 - byte ) to buffer " <nl> - " % p + 0x % 08x \ n " , <nl> + " % p + 0x % 08lx \ n " , <nl> i , pfb_data , pfb_lenpos ) ) ; <nl> <nl> if ( pfb_lenpos + 3 > pfb_len + 2 ) <nl> <nl> break ; <nl> <nl> FT_TRACE3 ( ( " Write POST fragment # % d header ( 6 - byte ) to buffer " <nl> - " % p + 0x % 08x \ n " , <nl> + " % p + 0x % 08lx \ n " , <nl> i , pfb_data , pfb_pos ) ) ; <nl> <nl> if ( pfb_pos + 6 > pfb_len + 2 ) <nl> <nl> if ( pfb_pos > pfb_len | | pfb_pos + rlen > pfb_len ) <nl> goto Exit2 ; <nl> <nl> - FT_TRACE3 ( ( " Load POST fragment # % d ( % d byte ) to buffer " <nl> - " % p + 0x % 08x \ n " , <nl> + FT_TRACE3 ( ( " Load POST fragment # % d ( % ld byte ) to buffer " <nl> + " % p + 0x % 08lx \ n " , <nl> i , rlen , pfb_data , pfb_pos ) ) ; <nl> <nl> error = FT_Stream_Read ( stream , ( FT_Byte * ) pfb_data + pfb_pos , rlen ) ; <nl> <nl> args2 . flags = FT_OPEN_PATHNAME ; <nl> args2 . pathname = file_names [ i ] ? file_names [ i ] : args - > pathname ; <nl> <nl> - FT_TRACE3 ( ( " Try rule % d : % s ( offset = % d ) . . . " , <nl> + FT_TRACE3 ( ( " Try rule % d : % s ( offset = % ld ) . . . " , <nl> i , args2 . pathname , offsets [ i ] ) ) ; <nl> <nl> error = FT_Stream_New ( library , & args2 , & stream2 ) ; <nl> <nl> if ( error ) <nl> { <nl> FT_FREE ( node ) ; <nl> + if ( size ) <nl> + FT_FREE ( size - > internal ) ; <nl> FT_FREE ( size ) ; <nl> } <nl> <nl> <nl> FT_Size_Metrics * metrics = & face - > size - > metrics ; <nl> <nl> <nl> - FT_TRACE5 ( ( " x scale : % d ( % f ) \ n " , <nl> + FT_TRACE5 ( ( " x scale : % ld ( % f ) \ n " , <nl> metrics - > x_scale , metrics - > x_scale / 65536 . 0 ) ) ; <nl> - FT_TRACE5 ( ( " y scale : % d ( % f ) \ n " , <nl> + FT_TRACE5 ( ( " y scale : % ld ( % f ) \ n " , <nl> metrics - > y_scale , metrics - > y_scale / 65536 . 0 ) ) ; <nl> FT_TRACE5 ( ( " ascender : % f \ n " , metrics - > ascender / 64 . 0 ) ) ; <nl> FT_TRACE5 ( ( " descender : % f \ n " , metrics - > descender / 64 . 0 ) ) ; <nl> <nl> FT_Size_Metrics * metrics = & face - > size - > metrics ; <nl> <nl> <nl> - FT_TRACE5 ( ( " x scale : % d ( % f ) \ n " , <nl> + FT_TRACE5 ( ( " x scale : % ld ( % f ) \ n " , <nl> metrics - > x_scale , metrics - > x_scale / 65536 . 0 ) ) ; <nl> - FT_TRACE5 ( ( " y scale : % d ( % f ) \ n " , <nl> + FT_TRACE5 ( ( " y scale : % ld ( % f ) \ n " , <nl> metrics - > y_scale , metrics - > y_scale / 65536 . 0 ) ) ; <nl> FT_TRACE5 ( ( " ascender : % f \ n " , metrics - > ascender / 64 . 0 ) ) ; <nl> FT_TRACE5 ( ( " descender : % f \ n " , metrics - > descender / 64 . 0 ) ) ; <nl> <nl> if ( akerning - > x ! = orig_x_rounded | | <nl> akerning - > y ! = orig_y_rounded ) <nl> FT_TRACE5 ( ( " FT_Get_Kerning : horizontal kerning " <nl> - " ( % d , % d ) scaled down to ( % d , % d ) pixels \ n " , <nl> + " ( % ld , % ld ) scaled down to ( % ld , % ld ) pixels \ n " , <nl> orig_x_rounded / 64 , orig_y_rounded / 64 , <nl> akerning - > x / 64 , akerning - > y / 64 ) ) ; <nl> } <nl> <nl> if ( charcode > 0xFFFFFFFFUL ) <nl> { <nl> FT_TRACE1 ( ( " FT_Get_Char_Index : too large charcode " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , charcode ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , charcode ) ) ; <nl> } <nl> <nl> result = cmap - > clazz - > char_index ( cmap , ( FT_UInt32 ) charcode ) ; <nl> <nl> { <nl> FT_TRACE1 ( ( " FT_Face_GetCharVariantIndex : " <nl> " too large charcode " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , charcode ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , charcode ) ) ; <nl> } <nl> if ( variantSelector > 0xFFFFFFFFUL ) <nl> { <nl> FT_TRACE1 ( ( " FT_Face_GetCharVariantIndex : " <nl> " too large variantSelector " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , variantSelector ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , variantSelector ) ) ; <nl> } <nl> <nl> result = vcmap - > clazz - > char_var_index ( vcmap , ucmap , <nl> <nl> { <nl> FT_TRACE1 ( ( " FT_Face_GetCharVariantIsDefault : " <nl> " too large charcode " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , charcode ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , charcode ) ) ; <nl> } <nl> if ( variantSelector > 0xFFFFFFFFUL ) <nl> { <nl> FT_TRACE1 ( ( " FT_Face_GetCharVariantIsDefault : " <nl> " too large variantSelector " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , variantSelector ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , variantSelector ) ) ; <nl> } <nl> <nl> result = vcmap - > clazz - > char_var_default ( vcmap , <nl> <nl> if ( charcode > 0xFFFFFFFFUL ) <nl> { <nl> FT_TRACE1 ( ( " FT_Face_GetVariantsOfChar : too large charcode " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , charcode ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , charcode ) ) ; <nl> } <nl> <nl> result = vcmap - > clazz - > charvariant_list ( vcmap , memory , <nl> <nl> if ( variantSelector > 0xFFFFFFFFUL ) <nl> { <nl> FT_TRACE1 ( ( " FT_Get_Char_Index : too large variantSelector " ) ) ; <nl> - FT_TRACE1 ( ( " 0x % x is truncated \ n " , variantSelector ) ) ; <nl> + FT_TRACE1 ( ( " 0x % lx is truncated \ n " , variantSelector ) ) ; <nl> } <nl> <nl> result = vcmap - > clazz - > variantchar_list ( vcmap , memory , <nl> mmm a / thirdparty / freetype / src / base / ftotval . c <nl> ppp b / thirdparty / freetype / src / base / ftotval . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_OPENTYPE_VALIDATE_H <nl> - # include FT_OPENTYPE_VALIDATE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svotval . h > <nl> + # include < freetype / ftotval . h > <nl> <nl> <nl> / * documentation is in ftotval . h * / <nl> mmm a / thirdparty / freetype / src / base / ftoutln . c <nl> ppp b / thirdparty / freetype / src / base / ftoutln . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_TRIGONOMETRY_H <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / fttrigon . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> first = ( FT_UInt ) last + 1 ; <nl> } <nl> <nl> - FT_TRACE5 ( ( " FT_Outline_Decompose : Done \ n " , n ) ) ; <nl> + FT_TRACE5 ( ( " FT_Outline_Decompose : Done \ n " ) ) ; <nl> return FT_Err_Ok ; <nl> <nl> Invalid_Outline : <nl> <nl> if ( cbox . xMin = = cbox . xMax | | cbox . yMin = = cbox . yMax ) <nl> return FT_ORIENTATION_NONE ; <nl> <nl> + / * Reject values large outlines . * / <nl> + if ( cbox . xMin < - 0x1000000L | | cbox . yMin < - 0x1000000L | | <nl> + cbox . xMax > 0x1000000L | | cbox . yMax > 0x1000000L ) <nl> + return FT_ORIENTATION_NONE ; <nl> + <nl> xshift = FT_MSB ( ( FT_UInt32 ) ( FT_ABS ( cbox . xMax ) | <nl> FT_ABS ( cbox . xMin ) ) ) - 14 ; <nl> xshift = FT_MAX ( xshift , 0 ) ; <nl> mmm a / thirdparty / freetype / src / base / ftpatent . c <nl> ppp b / thirdparty / freetype / src / base / ftpatent . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_SERVICE_SFNT_H <nl> - # include FT_SERVICE_TRUETYPE_GLYF_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / services / svsfnt . h > <nl> + # include < freetype / internal / services / svttglyf . h > <nl> <nl> <nl> / * documentation is in freetype . h * / <nl> mmm a / thirdparty / freetype / src / base / ftpfr . c <nl> ppp b / thirdparty / freetype / src / base / ftpfr . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_PFR_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svpfr . h > <nl> <nl> <nl> / * check the format * / <nl> mmm a / thirdparty / freetype / src / base / ftpsprop . c <nl> ppp b / thirdparty / freetype / src / base / ftpsprop . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_DRIVER_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_POSTSCRIPT_PROPS_H <nl> + # include < freetype / ftdriver . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftpsprop . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / ftrfork . c <nl> ppp b / thirdparty / freetype / src / base / ftrfork . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_RFORK_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftrfork . h > <nl> <nl> # include " ftbase . h " <nl> <nl> <nl> ( char ) ( 0xFF & ( tag_internal > > 16 ) ) , <nl> ( char ) ( 0xFF & ( tag_internal > > 8 ) ) , <nl> ( char ) ( 0xFF & ( tag_internal > > 0 ) ) ) ) ; <nl> - FT_TRACE3 ( ( " : subcount = % d , suboffset = 0x % 04x \ n " , <nl> + FT_TRACE3 ( ( " : subcount = % d , suboffset = 0x % 04lx \ n " , <nl> subcnt , rpos ) ) ; <nl> <nl> if ( tag_internal = = tag ) <nl> <nl> ref [ j ] . offset = temp & 0xFFFFFFL ; <nl> <nl> FT_TRACE3 ( ( " [ % d ] : " <nl> - " resource_id = 0x % 04x , offset = 0x % 08x \ n " , <nl> + " resource_id = 0x % 04x , offset = 0x % 08lx \ n " , <nl> j , ( FT_UShort ) ref [ j ] . res_id , ref [ j ] . offset ) ) ; <nl> } <nl> <nl> <nl> <nl> for ( j = 0 ; j < * count ; j + + ) <nl> FT_TRACE3 ( ( " [ % d ] : " <nl> - " resource_id = 0x % 04x , offset = 0x % 08x \ n " , <nl> + " resource_id = 0x % 04x , offset = 0x % 08lx \ n " , <nl> j , ref [ j ] . res_id , ref [ j ] . offset ) ) ; <nl> } <nl> <nl> mmm a / thirdparty / freetype / src / base / ftsnames . c <nl> ppp b / thirdparty / freetype / src / base / ftsnames . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_SFNT_NAMES_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / ftsnames . h > <nl> + # include < freetype / internal / tttypes . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_SFNT_NAMES <nl> mmm a / thirdparty / freetype / src / base / ftstream . c <nl> ppp b / thirdparty / freetype / src / base / ftstream . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / ftstroke . c <nl> ppp b / thirdparty / freetype / src / base / ftstroke . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_STROKER_H <nl> - # include FT_TRIGONOMETRY_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / ftstroke . h > <nl> + # include < freetype / fttrigon . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> / * declare an extern to access ` ft_outline_glyph_class ' globally * / <nl> mmm a / thirdparty / freetype / src / base / ftsynth . c <nl> ppp b / thirdparty / freetype / src / base / ftsynth . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_SYNTHESIS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_BITMAP_H <nl> + # include < freetype / ftsynth . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftbitmap . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> if ( ( ystr > > 6 ) > FT_INT_MAX | | ( ystr > > 6 ) < FT_INT_MIN ) <nl> { <nl> FT_TRACE1 ( ( " FT_GlyphSlot_Embolden : " ) ) ; <nl> - FT_TRACE1 ( ( " too strong emboldening parameter ystr = % d \ n " , ystr ) ) ; <nl> + FT_TRACE1 ( ( " too strong emboldening parameter ystr = % ld \ n " , ystr ) ) ; <nl> return ; <nl> } <nl> error = FT_GlyphSlot_Own_Bitmap ( slot ) ; <nl> mmm a / thirdparty / freetype / src / base / ftsystem . c <nl> ppp b / thirdparty / freetype / src / base / ftsystem . c <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_SYSTEM_H <nl> - # include FT_ERRORS_H <nl> - # include FT_TYPES_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / ftsystem . h > <nl> + # include < freetype / fterrors . h > <nl> + # include < freetype / fttypes . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / fttrigon . c <nl> ppp b / thirdparty / freetype / src / base / fttrigon . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_TRIGONOMETRY_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / fttrigon . h > <nl> <nl> <nl> / * the Cordic shrink factor 0 . 858785336480436 * 2 ^ 32 * / <nl> mmm a / thirdparty / freetype / src / base / fttype1 . c <nl> ppp b / thirdparty / freetype / src / base / fttype1 . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_SERVICE_POSTSCRIPT_INFO_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / services / svpsinfo . h > <nl> <nl> <nl> / * documentation is in t1tables . h * / <nl> mmm a / thirdparty / freetype / src / base / ftutil . c <nl> ppp b / thirdparty / freetype / src / base / ftutil . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_LIST_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftlist . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / base / ftver . rc <nl> ppp b / thirdparty / freetype / src / base / ftver . rc <nl> <nl> <nl> # include < windows . h > <nl> <nl> - # define FT_VERSION 2 , 10 , 2 , 0 <nl> - # define FT_VERSION_STR " 2 . 10 . 2 " <nl> + # define FT_VERSION 2 , 10 , 4 , 0 <nl> + # define FT_VERSION_STR " 2 . 10 . 4 " <nl> <nl> VS_VERSION_INFO VERSIONINFO <nl> FILEVERSION FT_VERSION <nl> mmm a / thirdparty / freetype / src / base / ftwinfnt . c <nl> ppp b / thirdparty / freetype / src / base / ftwinfnt . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_WINFONTS_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_WINFNT_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftwinfnt . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svwinfnt . h > <nl> <nl> <nl> / * documentation is in ftwinfnt . h * / <nl> mmm a / thirdparty / freetype / src / bdf / bdf . c <nl> ppp b / thirdparty / freetype / src / bdf / bdf . c <nl> THE SOFTWARE . <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " bdflib . c " <nl> # include " bdfdrivr . c " <nl> mmm a / thirdparty / freetype / src / bdf / bdf . h <nl> ppp b / thirdparty / freetype / src / bdf / bdf . h <nl> <nl> * Based on bdf . h , v 1 . 16 2000 / 03 / 16 20 : 08 : 51 mleisher <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_HASH_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / fthash . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / bdf / bdfdrivr . c <nl> ppp b / thirdparty / freetype / src / bdf / bdfdrivr . c <nl> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> THE SOFTWARE . <nl> * / <nl> <nl> - # include < ft2build . h > <nl> <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_BDF_H <nl> - # include FT_TRUETYPE_IDS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftbdf . h > <nl> + # include < freetype / ttnameid . h > <nl> <nl> - # include FT_SERVICE_BDF_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> + # include < freetype / internal / services / svbdf . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> <nl> # include " bdf . h " <nl> # include " bdfdrivr . h " <nl> THE SOFTWARE . <nl> Exit : <nl> if ( charcode > 0xFFFFFFFFUL ) <nl> { <nl> - FT_TRACE1 ( ( " bdf_cmap_char_next : charcode 0x % x > 32bit API " ) ) ; <nl> + FT_TRACE1 ( ( " bdf_cmap_char_next : charcode 0x % lx > 32bit API " , <nl> + charcode ) ) ; <nl> * acharcode = 0 ; <nl> / * XXX : result should be changed to indicate an overflow error * / <nl> } <nl> THE SOFTWARE . <nl> bdf_property_t * prop = NULL ; <nl> <nl> <nl> - FT_TRACE4 ( ( " number of glyphs : allocated % d ( used % d ) \ n " , <nl> + FT_TRACE4 ( ( " number of glyphs : allocated % ld ( used % ld ) \ n " , <nl> font - > glyphs_size , <nl> font - > glyphs_used ) ) ; <nl> - FT_TRACE4 ( ( " number of unencoded glyphs : allocated % d ( used % d ) \ n " , <nl> + FT_TRACE4 ( ( " number of unencoded glyphs : allocated % ld ( used % ld ) \ n " , <nl> font - > unencoded_size , <nl> font - > unencoded_used ) ) ; <nl> <nl> THE SOFTWARE . <nl> if ( font - > font_ascent > 0x7FFF | | font - > font_ascent < - 0x7FFF ) <nl> { <nl> font - > font_ascent = font - > font_ascent < 0 ? - 0x7FFF : 0x7FFF ; <nl> - FT_TRACE0 ( ( " BDF_Face_Init : clamping font ascent to value % d \ n " , <nl> + FT_TRACE0 ( ( " BDF_Face_Init : clamping font ascent to value % ld \ n " , <nl> font - > font_ascent ) ) ; <nl> } <nl> if ( font - > font_descent > 0x7FFF | | font - > font_descent < - 0x7FFF ) <nl> { <nl> font - > font_descent = font - > font_descent < 0 ? - 0x7FFF : 0x7FFF ; <nl> - FT_TRACE0 ( ( " BDF_Face_Init : clamping font descent to value % d \ n " , <nl> + FT_TRACE0 ( ( " BDF_Face_Init : clamping font descent to value % ld \ n " , <nl> font - > font_descent ) ) ; <nl> } <nl> <nl> THE SOFTWARE . <nl> prop - > value . l < - 0x504C2L ) <nl> { <nl> bsize - > size = 0x7FFF ; <nl> - FT_TRACE0 ( ( " BDF_Face_Init : clamping point size to value % d \ n " , <nl> + FT_TRACE0 ( ( " BDF_Face_Init : clamping point size to value % ld \ n " , <nl> bsize - > size ) ) ; <nl> } <nl> else <nl> THE SOFTWARE . <nl> if ( font - > point_size > 0x7FFF ) <nl> { <nl> bsize - > size = 0x7FFF ; <nl> - FT_TRACE0 ( ( " BDF_Face_Init : clamping point size to value % d \ n " , <nl> + FT_TRACE0 ( ( " BDF_Face_Init : clamping point size to value % ld \ n " , <nl> bsize - > size ) ) ; <nl> } <nl> else <nl> THE SOFTWARE . <nl> if ( prop - > value . l > 0x7FFF | | prop - > value . l < - 0x7FFF ) <nl> { <nl> bsize - > y_ppem = 0x7FFF < < 6 ; <nl> - FT_TRACE0 ( ( " BDF_Face_Init : clamping pixel size to value % d \ n " , <nl> + FT_TRACE0 ( ( " BDF_Face_Init : clamping pixel size to value % ld \ n " , <nl> bsize - > y_ppem ) ) ; <nl> } <nl> else <nl> THE SOFTWARE . <nl> for ( n = 0 ; n < font - > glyphs_size ; n + + ) <nl> { <nl> ( face - > en_table [ n ] ) . enc = cur [ n ] . encoding ; <nl> - FT_TRACE4 ( ( " idx % d , val 0x % lX \ n " , n , cur [ n ] . encoding ) ) ; <nl> + FT_TRACE4 ( ( " idx % ld , val 0x % lX \ n " , n , cur [ n ] . encoding ) ) ; <nl> ( face - > en_table [ n ] ) . glyph = ( FT_UShort ) n ; <nl> <nl> if ( cur [ n ] . encoding = = font - > default_char ) <nl> THE SOFTWARE . <nl> face - > default_glyph = ( FT_UInt ) n ; <nl> else <nl> FT_TRACE1 ( ( " BDF_Face_Init : " <nl> - " idx % d is too large for this system \ n " , n ) ) ; <nl> + " idx % ld is too large for this system \ n " , n ) ) ; <nl> } <nl> } <nl> } <nl> THE SOFTWARE . <nl> bitmap - > rows = glyph . bbx . height ; <nl> bitmap - > width = glyph . bbx . width ; <nl> if ( glyph . bpr > FT_INT_MAX ) <nl> - FT_TRACE1 ( ( " BDF_Glyph_Load : too large pitch % d is truncated \ n " , <nl> + FT_TRACE1 ( ( " BDF_Glyph_Load : too large pitch % ld is truncated \ n " , <nl> glyph . bpr ) ) ; <nl> bitmap - > pitch = ( int ) glyph . bpr ; / * same as FT_Bitmap . pitch * / <nl> <nl> THE SOFTWARE . <nl> if ( prop - > value . l > 0x7FFFFFFFL | | prop - > value . l < ( - 1 - 0x7FFFFFFFL ) ) <nl> { <nl> FT_TRACE1 ( ( " bdf_get_bdf_property : " <nl> - " too large integer 0x % x is truncated \ n " ) ) ; <nl> + " too large integer 0x % lx is truncated \ n " , <nl> + prop - > value . l ) ) ; <nl> } <nl> aproperty - > type = BDF_PROPERTY_TYPE_INTEGER ; <nl> aproperty - > u . integer = ( FT_Int32 ) prop - > value . l ; <nl> THE SOFTWARE . <nl> if ( prop - > value . ul > 0xFFFFFFFFUL ) <nl> { <nl> FT_TRACE1 ( ( " bdf_get_bdf_property : " <nl> - " too large cardinal 0x % x is truncated \ n " ) ) ; <nl> + " too large cardinal 0x % lx is truncated \ n " , <nl> + prop - > value . ul ) ) ; <nl> } <nl> aproperty - > type = BDF_PROPERTY_TYPE_CARDINAL ; <nl> aproperty - > u . cardinal = ( FT_UInt32 ) prop - > value . ul ; <nl> mmm a / thirdparty / freetype / src / bdf / bdfdrivr . h <nl> ppp b / thirdparty / freetype / src / bdf / bdfdrivr . h <nl> THE SOFTWARE . <nl> # ifndef BDFDRIVR_H_ <nl> # define BDFDRIVR_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> # include " bdf . h " <nl> <nl> mmm a / thirdparty / freetype / src / bdf / bdferror . h <nl> ppp b / thirdparty / freetype / src / bdf / bdferror . h <nl> <nl> # ifndef BDFERROR_H_ <nl> # define BDFERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX BDF_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_BDF <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * BDFERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / bdf / bdflib . c <nl> ppp b / thirdparty / freetype / src / bdf / bdflib . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> # include " bdf . h " <nl> # include " bdferror . h " <nl> mmm a / thirdparty / freetype / src / bzip2 / ftbzip2 . c <nl> ppp b / thirdparty / freetype / src / bzip2 / ftbzip2 . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_BZIP2_H <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftbzip2 . h > <nl> # include FT_CONFIG_STANDARD_LIBRARY_H <nl> <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX Bzip2_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Bzip2 <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> <nl> # ifdef FT_CONFIG_OPTION_USE_BZIP2 <nl> mmm a / thirdparty / freetype / src / cache / ftcache . c <nl> ppp b / thirdparty / freetype / src / cache / ftcache . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " ftcbasic . c " <nl> # include " ftccache . c " <nl> mmm a / thirdparty / freetype / src / cache / ftcbasic . c <nl> ppp b / thirdparty / freetype / src / cache / ftcbasic . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_CACHE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftcache . h > <nl> # include " ftcglyph . h " <nl> # include " ftcimage . h " <nl> # include " ftcsbits . h " <nl> <nl> <nl> if ( ( FT_ULong ) face - > num_glyphs > FT_UINT_MAX | | 0 > face - > num_glyphs ) <nl> FT_TRACE1 ( ( " ftc_basic_family_get_count : " <nl> - " too large number of glyphs in this face , truncated \ n " , <nl> + " the number of glyphs in this face is % ld , \ n " <nl> + " " <nl> + " which is too much and thus truncated \ n " , <nl> face - > num_glyphs ) ) ; <nl> <nl> if ( ! error ) <nl> <nl> # if FT_ULONG_MAX > FT_UINT_MAX <nl> if ( load_flags > FT_UINT_MAX ) <nl> FT_TRACE1 ( ( " FTC_ImageCache_LookupScaler : " <nl> - " higher bits in load_flags 0x % x are dropped \ n " , <nl> + " higher bits in load_flags 0x % lx are dropped \ n " , <nl> load_flags & ~ ( ( FT_ULong ) FT_UINT_MAX ) ) ) ; <nl> # endif <nl> <nl> <nl> # if FT_ULONG_MAX > FT_UINT_MAX <nl> if ( load_flags > FT_UINT_MAX ) <nl> FT_TRACE1 ( ( " FTC_ImageCache_LookupScaler : " <nl> - " higher bits in load_flags 0x % x are dropped \ n " , <nl> + " higher bits in load_flags 0x % lx are dropped \ n " , <nl> load_flags & ~ ( ( FT_ULong ) FT_UINT_MAX ) ) ) ; <nl> # endif <nl> <nl> mmm a / thirdparty / freetype / src / cache / ftccache . c <nl> ppp b / thirdparty / freetype / src / cache / ftccache . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ftcmanag . h " <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " ftccback . h " <nl> # include " ftcerror . h " <nl> mmm a / thirdparty / freetype / src / cache / ftccache . h <nl> ppp b / thirdparty / freetype / src / cache / ftccache . h <nl> <nl> # ifndef FTCCACHE_H_ <nl> # define FTCCACHE_H_ <nl> <nl> - <nl> + # include < freetype / internal / compiler - macros . h > <nl> # include " ftcmru . h " <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cache / ftccback . h <nl> ppp b / thirdparty / freetype / src / cache / ftccback . h <nl> <nl> # ifndef FTCCBACK_H_ <nl> # define FTCCBACK_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcmru . h " <nl> # include " ftcimage . h " <nl> # include " ftcmanag . h " <nl> # include " ftcglyph . h " <nl> # include " ftcsbits . h " <nl> <nl> + FT_BEGIN_HEADER <nl> <nl> FT_LOCAL ( void ) <nl> ftc_inode_free ( FTC_Node inode , <nl> <nl> ftc_node_destroy ( FTC_Node node , <nl> FTC_Manager manager ) ; <nl> <nl> + FT_END_HEADER <nl> <nl> # endif / * FTCCBACK_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / cache / ftccmap . c <nl> ppp b / thirdparty / freetype / src / cache / ftccmap . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_CACHE_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / ftcache . h > <nl> # include " ftcmanag . h " <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " ftccback . h " <nl> # include " ftcerror . h " <nl> mmm a / thirdparty / freetype / src / cache / ftcerror . h <nl> ppp b / thirdparty / freetype / src / cache / ftcerror . h <nl> <nl> # ifndef FTCERROR_H_ <nl> # define FTCERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX FTC_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Cache <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * FTCERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / cache / ftcglyph . c <nl> ppp b / thirdparty / freetype / src / cache / ftcglyph . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_CACHE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftcache . h > <nl> # include " ftcglyph . h " <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # include " ftccback . h " <nl> # include " ftcerror . h " <nl> mmm a / thirdparty / freetype / src / cache / ftcglyph . h <nl> ppp b / thirdparty / freetype / src / cache / ftcglyph . h <nl> <nl> # define FTCGLYPH_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ftcmanag . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / cache / ftcimage . c <nl> ppp b / thirdparty / freetype / src / cache / ftcimage . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcimage . h " <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> # include " ftccback . h " <nl> # include " ftcerror . h " <nl> mmm a / thirdparty / freetype / src / cache / ftcimage . h <nl> ppp b / thirdparty / freetype / src / cache / ftcimage . h <nl> <nl> # define FTCIMAGE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcglyph . h " <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cache / ftcmanag . c <nl> ppp b / thirdparty / freetype / src / cache / ftcmanag . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcmanag . h " <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_SIZES_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftsizes . h > <nl> <nl> # include " ftccback . h " <nl> # include " ftcerror . h " <nl> mmm a / thirdparty / freetype / src / cache / ftcmanag . h <nl> ppp b / thirdparty / freetype / src / cache / ftcmanag . h <nl> <nl> # define FTCMANAG_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcmru . h " <nl> # include " ftccache . h " <nl> <nl> mmm a / thirdparty / freetype / src / cache / ftcmru . c <nl> ppp b / thirdparty / freetype / src / cache / ftcmru . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcmru . h " <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " ftcerror . h " <nl> <nl> mmm a / thirdparty / freetype / src / cache / ftcmru . h <nl> ppp b / thirdparty / freetype / src / cache / ftcmru . h <nl> <nl> # define FTCMRU_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / compiler - macros . h > <nl> <nl> # ifdef FREETYPE_H <nl> # error " freetype . h of FreeType 1 has been loaded ! " <nl> mmm a / thirdparty / freetype / src / cache / ftcsbits . c <nl> ppp b / thirdparty / freetype / src / cache / ftcsbits . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcsbits . h " <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_ERRORS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / fterrors . h > <nl> <nl> # include " ftccback . h " <nl> # include " ftcerror . h " <nl> mmm a / thirdparty / freetype / src / cache / ftcsbits . h <nl> ppp b / thirdparty / freetype / src / cache / ftcsbits . h <nl> <nl> # define FTCSBITS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_CACHE_H <nl> + # include < freetype / ftcache . h > <nl> # include " ftcglyph . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / cff / cff . c <nl> ppp b / thirdparty / freetype / src / cff / cff . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " cffcmap . c " <nl> # include " cffdrivr . c " <nl> mmm a / thirdparty / freetype / src / cff / cffcmap . c <nl> ppp b / thirdparty / freetype / src / cff / cffcmap . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> # include " cffcmap . h " <nl> # include " cffload . h " <nl> <nl> mmm a / thirdparty / freetype / src / cff / cffcmap . h <nl> ppp b / thirdparty / freetype / src / cff / cffcmap . h <nl> <nl> # ifndef CFFCMAP_H_ <nl> # define CFFCMAP_H_ <nl> <nl> - # include FT_INTERNAL_CFF_OBJECTS_TYPES_H <nl> + # include < freetype / internal / cffotypes . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> FT_BEGIN_HEADER <nl> } CFF_CMapStdRec ; <nl> <nl> <nl> - FT_DECLARE_CMAP_CLASS ( cff_cmap_encoding_class_rec ) <nl> + FT_DECLARE_CMAP_CLASS ( cff_cmap_encoding_class_rec ) <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> FT_BEGIN_HEADER <nl> <nl> / * unicode ( synthetic ) cmaps * / <nl> <nl> - FT_DECLARE_CMAP_CLASS ( cff_cmap_unicode_class_rec ) <nl> + FT_DECLARE_CMAP_CLASS ( cff_cmap_unicode_class_rec ) <nl> <nl> <nl> FT_END_HEADER <nl> mmm a / thirdparty / freetype / src / cff / cffdrivr . c <nl> ppp b / thirdparty / freetype / src / cff / cffdrivr . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_POSTSCRIPT_PROPS_H <nl> - # include FT_SERVICE_CID_H <nl> - # include FT_SERVICE_POSTSCRIPT_INFO_H <nl> - # include FT_SERVICE_POSTSCRIPT_NAME_H <nl> - # include FT_SERVICE_TT_CMAP_H <nl> - # include FT_SERVICE_CFF_TABLE_LOAD_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / ftpsprop . h > <nl> + # include < freetype / internal / services / svcid . h > <nl> + # include < freetype / internal / services / svpsinfo . h > <nl> + # include < freetype / internal / services / svpostnm . h > <nl> + # include < freetype / internal / services / svttcmap . h > <nl> + # include < freetype / internal / services / svcfftl . h > <nl> <nl> # include " cffdrivr . h " <nl> # include " cffgload . h " <nl> <nl> # include " cffobjs . h " <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_METRICS_VARIATIONS_H <nl> + # include < freetype / internal / services / svmm . h > <nl> + # include < freetype / internal / services / svmetric . h > <nl> # endif <nl> <nl> # include " cfferrs . h " <nl> <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> - # include FT_SERVICE_GLYPH_DICT_H <nl> - # include FT_SERVICE_PROPERTIES_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> + # include < freetype / internal / services / svgldict . h > <nl> + # include < freetype / internal / services / svprop . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> { <nl> if ( dict - > cid_supplement < FT_INT_MIN | | <nl> dict - > cid_supplement > FT_INT_MAX ) <nl> - FT_TRACE1 ( ( " cff_get_ros : too large supplement % d is truncated \ n " , <nl> + FT_TRACE1 ( ( " cff_get_ros : too large supplement % ld is truncated \ n " , <nl> dict - > cid_supplement ) ) ; <nl> * supplement = ( FT_Int ) dict - > cid_supplement ; <nl> } <nl> mmm a / thirdparty / freetype / src / cff / cffdrivr . h <nl> ppp b / thirdparty / freetype / src / cff / cffdrivr . h <nl> <nl> # define CFFDRIVER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cff / cfferrs . h <nl> ppp b / thirdparty / freetype / src / cff / cfferrs . h <nl> <nl> # ifndef CFFERRS_H_ <nl> # define CFFERRS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_BASE FT_Mod_Err_CFF <nl> <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * CFFERRS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / cff / cffgload . c <nl> ppp b / thirdparty / freetype / src / cff / cffgload . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " cffload . h " <nl> # include " cffgload . h " <nl> <nl> PSAux_Service psaux = ( PSAux_Service ) face - > psaux ; <nl> const CFF_Decoder_Funcs decoder_funcs = psaux - > cff_decoder_funcs ; <nl> <nl> - FT_Matrix font_matrix ; <nl> - FT_Vector font_offset ; <nl> + FT_Matrix font_matrix ; <nl> + FT_Vector font_offset ; <nl> <nl> <nl> force_scaling = FALSE ; <nl> <nl> top_upm = ( FT_Long ) cff - > top_font . font_dict . units_per_em ; <nl> sub_upm = ( FT_Long ) cff - > subfonts [ fd_index ] - > font_dict . units_per_em ; <nl> <nl> - <nl> font_matrix = cff - > subfonts [ fd_index ] - > font_dict . font_matrix ; <nl> font_offset = cff - > subfonts [ fd_index ] - > font_dict . font_offset ; <nl> <nl> <nl> PS_Driver driver = ( PS_Driver ) FT_FACE_DRIVER ( face ) ; <nl> # endif <nl> <nl> - <nl> FT_Byte * charstring ; <nl> FT_ULong charstring_len ; <nl> <nl> <nl> metrics - > horiBearingY = cbox . yMax ; <nl> <nl> if ( has_vertical_info ) <nl> + { <nl> metrics - > vertBearingX = metrics - > horiBearingX - <nl> metrics - > horiAdvance / 2 ; <nl> + metrics - > vertBearingY = FT_MulFix ( metrics - > vertBearingY , <nl> + glyph - > y_scale ) ; <nl> + } <nl> else <nl> { <nl> if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) <nl> mmm a / thirdparty / freetype / src / cff / cffgload . h <nl> ppp b / thirdparty / freetype / src / cff / cffgload . h <nl> <nl> # define CFFGLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_CFF_OBJECTS_TYPES_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / cffotypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cff / cffload . c <nl> ppp b / thirdparty / freetype / src / cff / cffload . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_TYPE1_TABLES_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / t1tables . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / services / svmm . h > <nl> # endif <nl> <nl> # include " cffload . h " <nl> <nl> FT_Error error = FT_Err_Ok ; <nl> FT_Memory memory = idx - > stream - > memory ; <nl> <nl> - FT_Byte * * t = NULL ; <nl> + FT_Byte * * tbl = NULL ; <nl> FT_Byte * new_bytes = NULL ; <nl> FT_ULong new_size ; <nl> <nl> <nl> new_size = idx - > data_size + idx - > count ; <nl> <nl> if ( idx - > count > 0 & & <nl> - ! FT_NEW_ARRAY ( t , idx - > count + 1 ) & & <nl> + ! FT_NEW_ARRAY ( tbl , idx - > count + 1 ) & & <nl> ( ! pool | | ! FT_ALLOC ( new_bytes , new_size ) ) ) <nl> { <nl> FT_ULong n , cur_offset ; <nl> - FT_ULong extra = 0 ; <nl> + FT_ULong extra = 0 ; <nl> FT_Byte * org_bytes = idx - > bytes ; <nl> <nl> <nl> <nl> if ( cur_offset ! = 0 ) <nl> { <nl> FT_TRACE0 ( ( " cff_index_get_pointers : " <nl> - " invalid first offset value % d set to zero \ n " , <nl> + " invalid first offset value % ld set to zero \ n " , <nl> cur_offset ) ) ; <nl> cur_offset = 0 ; <nl> } <nl> <nl> if ( ! pool ) <nl> - t [ 0 ] = org_bytes + cur_offset ; <nl> + tbl [ 0 ] = org_bytes + cur_offset ; <nl> else <nl> - t [ 0 ] = new_bytes + cur_offset ; <nl> + tbl [ 0 ] = new_bytes + cur_offset ; <nl> <nl> for ( n = 1 ; n < = idx - > count ; n + + ) <nl> { <nl> <nl> next_offset = idx - > data_size ; <nl> <nl> if ( ! pool ) <nl> - t [ n ] = org_bytes + next_offset ; <nl> + tbl [ n ] = org_bytes + next_offset ; <nl> else <nl> { <nl> - t [ n ] = new_bytes + next_offset + extra ; <nl> + tbl [ n ] = new_bytes + next_offset + extra ; <nl> <nl> if ( next_offset ! = cur_offset ) <nl> { <nl> - FT_MEM_COPY ( t [ n - 1 ] , org_bytes + cur_offset , t [ n ] - t [ n - 1 ] ) ; <nl> - t [ n ] [ 0 ] = ' \ 0 ' ; <nl> - t [ n ] + = 1 ; <nl> + FT_MEM_COPY ( tbl [ n - 1 ] , <nl> + org_bytes + cur_offset , <nl> + tbl [ n ] - tbl [ n - 1 ] ) ; <nl> + tbl [ n ] [ 0 ] = ' \ 0 ' ; <nl> + tbl [ n ] + = 1 ; <nl> extra + + ; <nl> } <nl> } <nl> <nl> cur_offset = next_offset ; <nl> } <nl> - * table = t ; <nl> + * table = tbl ; <nl> <nl> if ( pool ) <nl> * pool = new_bytes ; <nl> <nl> } <nl> <nl> Exit : <nl> + if ( error & & new_bytes ) <nl> + FT_FREE ( new_bytes ) ; <nl> + if ( error & & tbl ) <nl> + FT_FREE ( tbl ) ; <nl> + <nl> return error ; <nl> } <nl> <nl> <nl> idx - > data_offset > stream - > size - off2 + 1 ) <nl> { <nl> FT_ERROR ( ( " cff_index_access_element : " <nl> - " offset to next entry ( % d ) " <nl> - " exceeds the end of stream ( % d ) \ n " , <nl> + " offset to next entry ( % ld ) " <nl> + " exceeds the end of stream ( % ld ) \ n " , <nl> off2 , stream - > size - idx - > data_offset + 1 ) ) ; <nl> off2 = stream - > size - idx - > data_offset + 1 ; <nl> } <nl> <nl> if ( glyph_sid > 0xFFFFL - nleft ) <nl> { <nl> FT_ERROR ( ( " cff_charset_load : invalid SID range trimmed " <nl> - " nleft = % d - > % d \ n " , nleft , 0xFFFFL - glyph_sid ) ) ; <nl> + " nleft = % d - > % ld \ n " , nleft , 0xFFFFL - glyph_sid ) ) ; <nl> nleft = ( FT_UInt ) ( 0xFFFFL - glyph_sid ) ; <nl> } <nl> <nl> <nl> if ( priv - > blue_shift > 1000 | | priv - > blue_shift < 0 ) <nl> { <nl> FT_TRACE2 ( ( " cff_load_private_dict : " <nl> - " setting unlikely BlueShift value % d to default ( 7 ) \ n " , <nl> + " setting unlikely BlueShift value % ld to default ( 7 ) \ n " , <nl> priv - > blue_shift ) ) ; <nl> priv - > blue_shift = 7 ; <nl> } <nl> <nl> if ( priv - > blue_fuzz > 1000 | | priv - > blue_fuzz < 0 ) <nl> { <nl> FT_TRACE2 ( ( " cff_load_private_dict : " <nl> - " setting unlikely BlueFuzz value % d to default ( 1 ) \ n " , <nl> + " setting unlikely BlueFuzz value % ld to default ( 1 ) \ n " , <nl> priv - > blue_fuzz ) ) ; <nl> priv - > blue_fuzz = 1 ; <nl> } <nl> mmm a / thirdparty / freetype / src / cff / cffload . h <nl> ppp b / thirdparty / freetype / src / cff / cffload . h <nl> <nl> # define CFFLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> + # include < freetype / internal / cfftypes . h > <nl> # include " cffparse . h " <nl> - # include FT_INTERNAL_CFF_OBJECTS_TYPES_H / * for CFF_Face * / <nl> + # include < freetype / internal / cffotypes . h > / * for CFF_Face * / <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cff / cffobjs . c <nl> ppp b / thirdparty / freetype / src / cff / cffobjs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_ERRORS_H <nl> - # include FT_TRUETYPE_IDS_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / fterrors . h > <nl> + # include < freetype / ttnameid . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_METRICS_VARIATIONS_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / services / svmm . h > <nl> + # include < freetype / internal / services / svmetric . h > <nl> # endif <nl> <nl> - # include FT_INTERNAL_CFF_OBJECTS_TYPES_H <nl> + # include < freetype / internal / cffotypes . h > <nl> # include " cffobjs . h " <nl> # include " cffload . h " <nl> # include " cffcmap . h " <nl> <nl> # include " cfferrs . h " <nl> <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_SERVICE_CFF_TABLE_LOAD_H <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / services / svcfftl . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> FT_Error error = FT_Err_Ok ; <nl> PSH_Globals_Funcs funcs = cff_size_get_globals_funcs ( size ) ; <nl> <nl> + FT_Memory memory = cffsize - > face - > memory ; <nl> + CFF_Internal internal = NULL ; <nl> + CFF_Face face = ( CFF_Face ) cffsize - > face ; <nl> + CFF_Font font = ( CFF_Font ) face - > extra . data ; <nl> <nl> - if ( funcs ) <nl> - { <nl> - CFF_Face face = ( CFF_Face ) cffsize - > face ; <nl> - CFF_Font font = ( CFF_Font ) face - > extra . data ; <nl> - CFF_Internal internal = NULL ; <nl> + PS_PrivateRec priv ; <nl> <nl> - PS_PrivateRec priv ; <nl> - FT_Memory memory = cffsize - > face - > memory ; <nl> + FT_UInt i ; <nl> <nl> - FT_UInt i ; <nl> + if ( ! funcs ) <nl> + goto Exit ; <nl> + <nl> + if ( FT_NEW ( internal ) ) <nl> + goto Exit ; <nl> <nl> + cff_make_private_dict ( & font - > top_font , & priv ) ; <nl> + error = funcs - > create ( cffsize - > face - > memory , & priv , <nl> + & internal - > topfont ) ; <nl> + if ( error ) <nl> + goto Exit ; <nl> + <nl> + for ( i = font - > num_subfonts ; i > 0 ; i - - ) <nl> + { <nl> + CFF_SubFont sub = font - > subfonts [ i - 1 ] ; <nl> <nl> - if ( FT_NEW ( internal ) ) <nl> - goto Exit ; <nl> <nl> - cff_make_private_dict ( & font - > top_font , & priv ) ; <nl> + cff_make_private_dict ( sub , & priv ) ; <nl> error = funcs - > create ( cffsize - > face - > memory , & priv , <nl> - & internal - > topfont ) ; <nl> + & internal - > subfonts [ i - 1 ] ) ; <nl> if ( error ) <nl> goto Exit ; <nl> + } <nl> <nl> - for ( i = font - > num_subfonts ; i > 0 ; i - - ) <nl> - { <nl> - CFF_SubFont sub = font - > subfonts [ i - 1 ] ; <nl> + cffsize - > internal - > module_data = internal ; <nl> <nl> + size - > strike_index = 0xFFFFFFFFUL ; <nl> <nl> - cff_make_private_dict ( sub , & priv ) ; <nl> - error = funcs - > create ( cffsize - > face - > memory , & priv , <nl> - & internal - > subfonts [ i - 1 ] ) ; <nl> - if ( error ) <nl> - goto Exit ; <nl> + Exit : <nl> + if ( error ) <nl> + { <nl> + if ( internal ) <nl> + { <nl> + for ( i = font - > num_subfonts ; i > 0 ; i - - ) <nl> + FT_FREE ( internal - > subfonts [ i - 1 ] ) ; <nl> + FT_FREE ( internal - > topfont ) ; <nl> } <nl> <nl> - cffsize - > internal - > module_data = internal ; <nl> + FT_FREE ( internal ) ; <nl> } <nl> <nl> - size - > strike_index = 0xFFFFFFFFUL ; <nl> - <nl> - Exit : <nl> return error ; <nl> } <nl> <nl> <nl> FT_LOCAL_DEF ( void ) <nl> cff_slot_done ( FT_GlyphSlot slot ) <nl> { <nl> - slot - > internal - > glyph_hints = NULL ; <nl> + if ( slot - > internal ) <nl> + slot - > internal - > glyph_hints = NULL ; <nl> } <nl> <nl> <nl> <nl> style_name = cff_strcpy ( memory , fullp ) ; <nl> <nl> / * remove the style part from the family name ( if present ) * / <nl> - remove_style ( cffface - > family_name , style_name ) ; <nl> + if ( style_name ) <nl> + remove_style ( cffface - > family_name , style_name ) ; <nl> } <nl> break ; <nl> } <nl> mmm a / thirdparty / freetype / src / cff / cffobjs . h <nl> ppp b / thirdparty / freetype / src / cff / cffobjs . h <nl> <nl> # define CFFOBJS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cff / cffparse . c <nl> ppp b / thirdparty / freetype / src / cff / cffparse . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " cffparse . h " <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_LIST_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / ftlist . h > <nl> <nl> # include " cfferrs . h " <nl> # include " cffload . h " <nl> <nl> ( max_scaling - min_scaling ) > 9 ) <nl> { <nl> FT_TRACE1 ( ( " cff_parse_font_matrix : " <nl> - " strange scaling values ( minimum % d , maximum % d ) , \ n " <nl> + " strange scaling values ( minimum % ld , maximum % ld ) , \ n " <nl> " " <nl> " using default matrix \ n " , min_scaling , max_scaling ) ) ; <nl> goto Unlikely ; <nl> <nl> bbox - > yMax = FT_RoundFix ( cff_parse_fixed ( parser , data ) ) ; <nl> error = FT_Err_Ok ; <nl> <nl> - FT_TRACE4 ( ( " [ % d % d % d % d ] \ n " , <nl> + FT_TRACE4 ( ( " [ % ld % ld % ld % ld ] \ n " , <nl> bbox - > xMin / 65536 , <nl> bbox - > yMin / 65536 , <nl> bbox - > xMax / 65536 , <nl> <nl> FT_TRACE1 ( ( " cff_parse_cid_ros : real supplement is rounded \ n " ) ) ; <nl> dict - > cid_supplement = cff_parse_num ( parser , data ) ; <nl> if ( dict - > cid_supplement < 0 ) <nl> - FT_TRACE1 ( ( " cff_parse_cid_ros : negative supplement % d is found \ n " , <nl> + FT_TRACE1 ( ( " cff_parse_cid_ros : negative supplement % ld is found \ n " , <nl> dict - > cid_supplement ) ) ; <nl> error = FT_Err_Ok ; <nl> <nl> - FT_TRACE4 ( ( " % d % d % d \ n " , <nl> + FT_TRACE4 ( ( " % d % d % ld \ n " , <nl> dict - > cid_registry , <nl> dict - > cid_ordering , <nl> dict - > cid_supplement ) ) ; <nl> <nl> FT_Byte * charstring_base ; <nl> FT_ULong charstring_len ; <nl> <nl> - FT_Fixed * stack ; <nl> - FT_ListNode node ; <nl> - CFF_T2_String t2 ; <nl> - size_t t2_size ; <nl> - FT_Byte * q ; <nl> + FT_Fixed * stack ; <nl> + FT_ListNode node ; <nl> + CFF_T2_String t2 ; <nl> + FT_Fixed t2_size ; <nl> + FT_Byte * q ; <nl> <nl> <nl> charstring_base = + + p ; <nl> mmm a / thirdparty / freetype / src / cff / cffparse . h <nl> ppp b / thirdparty / freetype / src / cff / cffparse . h <nl> <nl> # define CFFPARSE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / cfftypes . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cid / ciderrs . h <nl> ppp b / thirdparty / freetype / src / cid / ciderrs . h <nl> <nl> # ifndef CIDERRS_H_ <nl> # define CIDERRS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX CID_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_CID <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * CIDERRS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / cid / cidgload . c <nl> ppp b / thirdparty / freetype / src / cid / cidgload . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " cidload . h " <nl> # include " cidgload . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_CALC_H <nl> - <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / cfftypes . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " ciderrs . h " <nl> <nl> mmm a / thirdparty / freetype / src / cid / cidgload . h <nl> ppp b / thirdparty / freetype / src / cid / cidgload . h <nl> <nl> # define CIDGLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " cidobjs . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / cid / cidload . c <nl> ppp b / thirdparty / freetype / src / cid / cidload . c <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / t1types . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> # include " cidload . h " <nl> <nl> <nl> goto Exit ; <nl> } <nl> <nl> - FT_TRACE4 ( ( " % d \ n " , num_dicts ) ) ; <nl> + FT_TRACE4 ( ( " % ld \ n " , num_dicts ) ) ; <nl> <nl> / * <nl> * A single entry in the FDArray must ( at least ) contain the following <nl> <nl> if ( ( FT_ULong ) num_dicts > stream - > size / 100 ) <nl> { <nl> FT_TRACE0 ( ( " parse_fd_array : adjusting FDArray size " <nl> - " ( from % d to % d ) \ n " , <nl> + " ( from % ld to % ld ) \ n " , <nl> num_dicts , <nl> stream - > size / 100 ) ) ; <nl> num_dicts = ( FT_Long ) ( stream - > size / 100 ) ; <nl> <nl> dict - > expansion_factor = cid_parser_to_fixed ( parser , 0 ) ; <nl> dict - > private_dict . expansion_factor = dict - > expansion_factor ; <nl> <nl> - FT_TRACE4 ( ( " % d \ n " , dict - > expansion_factor ) ) ; <nl> + FT_TRACE4 ( ( " % ld \ n " , dict - > expansion_factor ) ) ; <nl> } <nl> <nl> return ; <nl> <nl> face - > root . stream - > size - parser - > data_offset ) <nl> { <nl> FT_TRACE0 ( ( " cid_face_open : adjusting length of binary data \ n " <nl> - " ( from % d to % d bytes ) \ n " , <nl> + " ( from % ld to % ld bytes ) \ n " , <nl> parser - > binary_length , <nl> face - > root . stream - > size - parser - > data_offset ) ) ; <nl> parser - > binary_length = face - > root . stream - > size - <nl> mmm a / thirdparty / freetype / src / cid / cidload . h <nl> ppp b / thirdparty / freetype / src / cid / cidload . h <nl> <nl> # define CIDLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftstream . h > <nl> # include " cidparse . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / cid / cidobjs . c <nl> ppp b / thirdparty / freetype / src / cid / cidobjs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> # include " cidgload . h " <nl> # include " cidload . h " <nl> <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / pshints . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " ciderrs . h " <nl> <nl> <nl> FT_LOCAL_DEF ( void ) <nl> cid_slot_done ( FT_GlyphSlot slot ) <nl> { <nl> - slot - > internal - > glyph_hints = NULL ; <nl> + if ( slot - > internal ) <nl> + slot - > internal - > glyph_hints = NULL ; <nl> } <nl> <nl> <nl> mmm a / thirdparty / freetype / src / cid / cidobjs . h <nl> ppp b / thirdparty / freetype / src / cid / cidobjs . h <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / internal / t1types . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cid / cidparse . c <nl> ppp b / thirdparty / freetype / src / cid / cidparse . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> # include " cidparse . h " <nl> <nl> mmm a / thirdparty / freetype / src / cid / cidparse . h <nl> ppp b / thirdparty / freetype / src / cid / cidparse . h <nl> <nl> # define CIDPARSE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / t1types . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cid / cidriver . c <nl> ppp b / thirdparty / freetype / src / cid / cidriver . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " cidriver . h " <nl> # include " cidgload . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_POSTSCRIPT_PROPS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftpsprop . h > <nl> <nl> # include " ciderrs . h " <nl> <nl> - # include FT_SERVICE_POSTSCRIPT_NAME_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> - # include FT_SERVICE_POSTSCRIPT_INFO_H <nl> - # include FT_SERVICE_CID_H <nl> - # include FT_SERVICE_PROPERTIES_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / services / svpostnm . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> + # include < freetype / internal / services / svpsinfo . h > <nl> + # include < freetype / internal / services / svcid . h > <nl> + # include < freetype / internal / services / svprop . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / cid / cidriver . h <nl> ppp b / thirdparty / freetype / src / cid / cidriver . h <nl> <nl> # define CIDRIVER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / cid / type1cid . c <nl> ppp b / thirdparty / freetype / src / cid / type1cid . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " cidgload . c " <nl> # include " cidload . c " <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvalid . c <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvalid . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " gxvbsln . c " <nl> # include " gxvcommn . c " <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvalid . h <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvalid . h <nl> <nl> # ifndef GXVALID_H_ <nl> # define GXVALID_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> - # include " gxverror . h " / * must come before FT_INTERNAL_VALIDATE_H * / <nl> + # include " gxverror . h " / * must come before ` ftvalid . h ' * / <nl> <nl> - # include FT_INTERNAL_VALIDATE_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftvalid . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvcommn . h <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvcommn . h <nl> <nl> # define GXVCOMMN_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " gxvalid . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_SFNT_NAMES_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftsnames . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / gxvalid / gxverror . h <nl> ppp b / thirdparty / freetype / src / gxvalid / gxverror . h <nl> <nl> # ifndef GXVERROR_H_ <nl> # define GXVERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX GXV_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_GXvalid <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * GXVERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvjust . c <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvjust . c <nl> <nl> # include " gxvalid . h " <nl> # include " gxvcommn . h " <nl> <nl> - # include FT_SFNT_NAMES_H <nl> + # include < freetype / ftsnames . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvkern . c <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvkern . c <nl> <nl> # include " gxvalid . h " <nl> # include " gxvcommn . h " <nl> <nl> - # include FT_SFNT_NAMES_H <nl> - # include FT_SERVICE_GX_VALIDATE_H <nl> + # include < freetype / ftsnames . h > <nl> + # include < freetype / internal / services / svgxval . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvmod . c <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvmod . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TRUETYPE_TABLES_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_GX_VALIDATE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_GX_VALIDATE_H <nl> + # include < freetype / tttables . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftgxval . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svgxval . h > <nl> <nl> # include " gxvmod . h " <nl> # include " gxvalid . h " <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvmod . h <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvmod . h <nl> <nl> # ifndef GXVMOD_H_ <nl> # define GXVMOD_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvmort . h <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvmort . h <nl> <nl> # include " gxvalid . h " <nl> # include " gxvcommn . h " <nl> <nl> - # include FT_SFNT_NAMES_H <nl> + # include < freetype / ftsnames . h > <nl> + <nl> + <nl> + FT_BEGIN_HEADER <nl> <nl> <nl> typedef struct GXV_mort_featureRec_ <nl> <nl> GXV_Validator gxvalid ) ; <nl> <nl> <nl> + FT_END_HEADER <nl> + <nl> # endif / * GXVMORT_H_ * / <nl> <nl> <nl> mmm a / thirdparty / freetype / src / gxvalid / gxvmorx . h <nl> ppp b / thirdparty / freetype / src / gxvalid / gxvmorx . h <nl> <nl> # include " gxvcommn . h " <nl> # include " gxvmort . h " <nl> <nl> - # include FT_SFNT_NAMES_H <nl> + # include < freetype / ftsnames . h > <nl> + <nl> + <nl> + FT_BEGIN_HEADER <nl> <nl> <nl> FT_LOCAL ( void ) <nl> <nl> GXV_Validator gxvalid ) ; <nl> <nl> <nl> + FT_END_HEADER <nl> + <nl> # endif / * GXVMORX_H_ * / <nl> <nl> <nl> mmm a / thirdparty / freetype / src / gzip / ftgzip . c <nl> ppp b / thirdparty / freetype / src / gzip / ftgzip . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_GZIP_H <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftgzip . h > <nl> # include FT_CONFIG_STANDARD_LIBRARY_H <nl> <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX Gzip_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Gzip <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> <nl> # ifdef FT_CONFIG_OPTION_USE_ZLIB <nl> mmm a / thirdparty / freetype / src / lzw / ftlzw . c <nl> ppp b / thirdparty / freetype / src / lzw / ftlzw . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_LZW_H <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftlzw . h > <nl> # include FT_CONFIG_STANDARD_LIBRARY_H <nl> <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX LZW_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_LZW <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> <nl> # ifdef FT_CONFIG_OPTION_USE_LZW <nl> mmm a / thirdparty / freetype / src / lzw / ftzopen . c <nl> ppp b / thirdparty / freetype / src / lzw / ftzopen . c <nl> <nl> * / <nl> <nl> # include " ftzopen . h " <nl> - # include FT_INTERNAL_MEMORY_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftmemory . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> <nl> static int <nl> mmm a / thirdparty / freetype / src / lzw / ftzopen . h <nl> ppp b / thirdparty / freetype / src / lzw / ftzopen . h <nl> <nl> # ifndef FTZOPEN_H_ <nl> # define FTZOPEN_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> + FT_BEGIN_HEADER <nl> <nl> / * <nl> * This is a complete re - implementation of the LZW file reader , <nl> <nl> <nl> / * * / <nl> <nl> + FT_END_HEADER <nl> + <nl> # endif / * FTZOPEN_H_ * / <nl> <nl> <nl> mmm a / thirdparty / freetype / src / otvalid / otvalid . c <nl> ppp b / thirdparty / freetype / src / otvalid / otvalid . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " otvbase . c " <nl> # include " otvcommn . c " <nl> mmm a / thirdparty / freetype / src / otvalid / otvalid . h <nl> ppp b / thirdparty / freetype / src / otvalid / otvalid . h <nl> <nl> # define OTVALID_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> - # include " otverror . h " / * must come before FT_INTERNAL_VALIDATE_H * / <nl> + # include " otverror . h " / * must come before ` ftvalid . h ' * / <nl> <nl> - # include FT_INTERNAL_VALIDATE_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftvalid . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / otvalid / otvcommn . h <nl> ppp b / thirdparty / freetype / src / otvalid / otvcommn . h <nl> <nl> # define OTVCOMMN_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " otvalid . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / otvalid / otverror . h <nl> ppp b / thirdparty / freetype / src / otvalid / otverror . h <nl> <nl> # ifndef OTVERROR_H_ <nl> # define OTVERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX OTV_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_OTvalid <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * OTVERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / otvalid / otvmod . c <nl> ppp b / thirdparty / freetype / src / otvalid / otvmod . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TRUETYPE_TABLES_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_OPENTYPE_VALIDATE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_OPENTYPE_VALIDATE_H <nl> + # include < freetype / tttables . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftotval . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svotval . h > <nl> <nl> # include " otvmod . h " <nl> # include " otvalid . h " <nl> mmm a / thirdparty / freetype / src / otvalid / otvmod . h <nl> ppp b / thirdparty / freetype / src / otvalid / otvmod . h <nl> <nl> # define OTVMOD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pcf / pcf . c <nl> ppp b / thirdparty / freetype / src / pcf / pcf . c <nl> THE SOFTWARE . <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " pcfdrivr . c " <nl> # include " pcfread . c " <nl> mmm a / thirdparty / freetype / src / pcf / pcf . h <nl> ppp b / thirdparty / freetype / src / pcf / pcf . h <nl> THE SOFTWARE . <nl> # define PCF_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftdrv . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pcf / pcfdrivr . c <nl> ppp b / thirdparty / freetype / src / pcf / pcfdrivr . c <nl> THE SOFTWARE . <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_GZIP_H <nl> - # include FT_LZW_H <nl> - # include FT_BZIP2_H <nl> - # include FT_ERRORS_H <nl> - # include FT_BDF_H <nl> - # include FT_TRUETYPE_IDS_H <nl> + <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftgzip . h > <nl> + # include < freetype / ftlzw . h > <nl> + # include < freetype / ftbzip2 . h > <nl> + # include < freetype / fterrors . h > <nl> + # include < freetype / ftbdf . h > <nl> + # include < freetype / ttnameid . h > <nl> <nl> # include " pcf . h " <nl> # include " pcfdrivr . h " <nl> THE SOFTWARE . <nl> # undef FT_COMPONENT <nl> # define FT_COMPONENT pcfread <nl> <nl> - # include FT_SERVICE_BDF_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> - # include FT_SERVICE_PROPERTIES_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / services / svbdf . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> + # include < freetype / internal / services / svprop . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> THE SOFTWARE . <nl> FT_UInt32 charcode = * acharcode ; <nl> FT_UShort charcodeRow ; <nl> FT_UShort charcodeCol ; <nl> - FT_Int result = 0 ; <nl> + FT_UInt result = 0 ; <nl> <nl> <nl> while ( charcode < ( FT_UInt32 ) ( enc - > lastRow * 256 + enc - > lastCol ) ) <nl> THE SOFTWARE . <nl> if ( prop - > value . l > 0x7FFFFFFFL | | <nl> prop - > value . l < ( - 1 - 0x7FFFFFFFL ) ) <nl> { <nl> - FT_TRACE1 ( ( " pcf_get_bdf_property : " ) ) ; <nl> - FT_TRACE1 ( ( " too large integer 0x % x is truncated \ n " ) ) ; <nl> + FT_TRACE1 ( ( " pcf_get_bdf_property : " <nl> + " too large integer 0x % lx is truncated \ n " , <nl> + prop - > value . l ) ) ; <nl> } <nl> <nl> / * <nl> mmm a / thirdparty / freetype / src / pcf / pcfdrivr . h <nl> ppp b / thirdparty / freetype / src / pcf / pcfdrivr . h <nl> THE SOFTWARE . <nl> # ifndef PCFDRIVR_H_ <nl> # define PCFDRIVR_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pcf / pcferror . h <nl> ppp b / thirdparty / freetype / src / pcf / pcferror . h <nl> <nl> # ifndef PCFERROR_H_ <nl> # define PCFERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX PCF_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_PCF <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * PCFERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / pcf / pcfread . c <nl> ppp b / thirdparty / freetype / src / pcf / pcfread . c <nl> THE SOFTWARE . <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> # include " pcf . h " <nl> # include " pcfread . h " <nl> THE SOFTWARE . <nl> toc - > count > 9 ) <nl> { <nl> FT_TRACE0 ( ( " pcf_read_TOC : adjusting number of tables " <nl> - " ( from % d to % d ) \ n " , <nl> + " ( from % ld to % ld ) \ n " , <nl> toc - > count , <nl> FT_MIN ( stream - > size > > 4 , 9 ) ) ) ; <nl> toc - > count = FT_MIN ( stream - > size > > 4 , 9 ) ; <nl> THE SOFTWARE . <nl> if ( tables [ i ] . type = = ( FT_UInt ) ( 1 < < j ) ) <nl> name = tableNames [ j ] ; <nl> <nl> - FT_TRACE4 ( ( " % d : type = % s , format = 0x % X , " <nl> + FT_TRACE4 ( ( " % d : type = % s , format = 0x % lX , " <nl> " size = % ld ( 0x % lX ) , offset = % ld ( 0x % lX ) \ n " , <nl> i , name , <nl> tables [ i ] . format , <nl> THE SOFTWARE . <nl> { <nl> properties [ i ] . value . l = props [ i ] . value ; <nl> <nl> - FT_TRACE4 ( ( " % d \ n " , properties [ i ] . value . l ) ) ; <nl> + FT_TRACE4 ( ( " % ld \ n " , properties [ i ] . value . l ) ) ; <nl> } <nl> } <nl> <nl> THE SOFTWARE . <nl> metrics - > descent = 0 ; <nl> <nl> FT_TRACE0 ( ( " pcf_get_metrics : " <nl> - " invalid metrics for glyph % d \ n " , i ) ) ; <nl> + " invalid metrics for glyph % ld \ n " , i ) ) ; <nl> } <nl> } <nl> <nl> THE SOFTWARE . <nl> <nl> sizebitmaps = bitmapSizes [ PCF_GLYPH_PAD_INDEX ( format ) ] ; <nl> <nl> - FT_TRACE4 ( ( " % ld - bit padding implies a size of % lu \ n " , <nl> + FT_TRACE4 ( ( " % d - bit padding implies a size of % lu \ n " , <nl> 8 < < i , bitmapSizes [ i ] ) ) ; <nl> } <nl> <nl> - FT_TRACE4 ( ( " % lu bitmaps , using % ld - bit padding \ n " , <nl> + FT_TRACE4 ( ( " % lu bitmaps , using % d - bit padding \ n " , <nl> nbitmaps , <nl> 8 < < PCF_GLYPH_PAD_INDEX ( format ) ) ) ; <nl> FT_TRACE4 ( ( " bitmap size : % lu \ n " , sizebitmaps ) ) ; <nl> THE SOFTWARE . <nl> if ( FT_ABS ( accel - > fontAscent ) > 0x7FFF ) <nl> { <nl> accel - > fontAscent = accel - > fontAscent < 0 ? - 0x7FFF : 0x7FFF ; <nl> - FT_TRACE0 ( ( " pfc_get_accel : clamping font ascent to value % d \ n " , <nl> + FT_TRACE0 ( ( " pfc_get_accel : clamping font ascent to value % ld \ n " , <nl> accel - > fontAscent ) ) ; <nl> } <nl> if ( FT_ABS ( accel - > fontDescent ) > 0x7FFF ) <nl> { <nl> accel - > fontDescent = accel - > fontDescent < 0 ? - 0x7FFF : 0x7FFF ; <nl> - FT_TRACE0 ( ( " pfc_get_accel : clamping font descent to value % d \ n " , <nl> + FT_TRACE0 ( ( " pfc_get_accel : clamping font descent to value % ld \ n " , <nl> accel - > fontDescent ) ) ; <nl> } <nl> <nl> THE SOFTWARE . <nl> if ( FT_ABS ( prop - > value . l ) > 0x504C2L ) / * 0x7FFF * 72270 / 7200 * / <nl> { <nl> bsize - > size = 0x7FFF ; <nl> - FT_TRACE0 ( ( " pcf_load_font : clamping point size to value % d \ n " , <nl> + FT_TRACE0 ( ( " pcf_load_font : clamping point size to value % ld \ n " , <nl> bsize - > size ) ) ; <nl> } <nl> else <nl> THE SOFTWARE . <nl> if ( FT_ABS ( prop - > value . l ) > 0x7FFF ) <nl> { <nl> bsize - > y_ppem = 0x7FFF < < 6 ; <nl> - FT_TRACE0 ( ( " pcf_load_font : clamping pixel size to value % d \ n " , <nl> + FT_TRACE0 ( ( " pcf_load_font : clamping pixel size to value % ld \ n " , <nl> bsize - > y_ppem ) ) ; <nl> } <nl> else <nl> mmm a / thirdparty / freetype / src / pcf / pcfread . h <nl> ppp b / thirdparty / freetype / src / pcf / pcfread . h <nl> THE SOFTWARE . <nl> # define PCFREAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / pcf / pcfutil . c <nl> ppp b / thirdparty / freetype / src / pcf / pcfutil . c <nl> in this Software without prior written authorization from The Open Group . <nl> / * Modified for use with FreeType * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " pcfutil . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / pcf / pcfutil . h <nl> ppp b / thirdparty / freetype / src / pcf / pcfutil . h <nl> THE SOFTWARE . <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - <nl> + # include < freetype / internal / compiler - macros . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfr . c <nl> ppp b / thirdparty / freetype / src / pfr / pfr . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " pfrcmap . c " <nl> # include " pfrdrivr . c " <nl> mmm a / thirdparty / freetype / src / pfr / pfrcmap . c <nl> ppp b / thirdparty / freetype / src / pfr / pfrcmap . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> # include " pfrcmap . h " <nl> # include " pfrobjs . h " <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfrcmap . h <nl> ppp b / thirdparty / freetype / src / pfr / pfrcmap . h <nl> <nl> # ifndef PFRCMAP_H_ <nl> # define PFRCMAP_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> # include " pfrtypes . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfrdrivr . c <nl> ppp b / thirdparty / freetype / src / pfr / pfrdrivr . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_SERVICE_PFR_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / services / svpfr . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> # include " pfrdrivr . h " <nl> # include " pfrobjs . h " <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfrdrivr . h <nl> ppp b / thirdparty / freetype / src / pfr / pfrdrivr . h <nl> <nl> # define PFRDRIVR_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pfr / pfrerror . h <nl> ppp b / thirdparty / freetype / src / pfr / pfrerror . h <nl> <nl> # ifndef PFRERROR_H_ <nl> # define PFRERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX PFR_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_PFR <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * PFRERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfrgload . c <nl> ppp b / thirdparty / freetype / src / pfr / pfrgload . c <nl> <nl> # include " pfrgload . h " <nl> # include " pfrsbit . h " <nl> # include " pfrload . h " / * for macro definitions * / <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " pfrerror . h " <nl> <nl> <nl> case 1 : / * 16 - bit absolute value * / <nl> PFR_CHECK ( 2 ) ; <nl> cur - > x = PFR_NEXT_SHORT ( p ) ; <nl> - FT_TRACE7 ( ( " x . % d " , cur - > x ) ) ; <nl> + FT_TRACE7 ( ( " x . % ld " , cur - > x ) ) ; <nl> break ; <nl> <nl> case 2 : / * 8 - bit delta * / <nl> <nl> case 1 : / * 16 - bit absolute value * / <nl> PFR_CHECK ( 2 ) ; <nl> cur - > y = PFR_NEXT_SHORT ( p ) ; <nl> - FT_TRACE7 ( ( " y . % d " , cur - > y ) ) ; <nl> + FT_TRACE7 ( ( " y . % ld " , cur - > y ) ) ; <nl> break ; <nl> <nl> case 2 : / * 8 - bit delta * / <nl> mmm a / thirdparty / freetype / src / pfr / pfrload . c <nl> ppp b / thirdparty / freetype / src / pfr / pfrload . c <nl> <nl> <nl> <nl> # include " pfrload . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> # include " pfrerror . h " <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfrload . h <nl> ppp b / thirdparty / freetype / src / pfr / pfrload . h <nl> <nl> # define PFRLOAD_H_ <nl> <nl> # include " pfrobjs . h " <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pfr / pfrobjs . c <nl> ppp b / thirdparty / freetype / src / pfr / pfrobjs . c <nl> <nl> # include " pfrgload . h " <nl> # include " pfrcmap . h " <nl> # include " pfrsbit . h " <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_TRUETYPE_IDS_H <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / ttnameid . h > <nl> <nl> # include " pfrerror . h " <nl> <nl> mmm a / thirdparty / freetype / src / pfr / pfrsbit . c <nl> ppp b / thirdparty / freetype / src / pfr / pfrsbit . c <nl> <nl> <nl> # include " pfrsbit . h " <nl> # include " pfrload . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> # include " pfrerror . h " <nl> <nl> <nl> ypos + ( FT_Long ) ysize < FT_INT_MIN ) <nl> { <nl> FT_TRACE1 ( ( " pfr_slot_load_bitmap : " ) ) ; <nl> - FT_TRACE1 ( ( " huge bitmap glyph % dx % d over FT_GlyphSlot \ n " , <nl> + FT_TRACE1 ( ( " huge bitmap glyph % ldx % ld over FT_GlyphSlot \ n " , <nl> xpos , ypos ) ) ; <nl> error = FT_THROW ( Invalid_Pixel_Size ) ; <nl> } <nl> mmm a / thirdparty / freetype / src / pfr / pfrtypes . h <nl> ppp b / thirdparty / freetype / src / pfr / pfrtypes . h <nl> <nl> # ifndef PFRTYPES_H_ <nl> # define PFRTYPES_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / psaux / afmparse . c <nl> ppp b / thirdparty / freetype / src / psaux / afmparse . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> # ifndef T1_CONFIG_OPTION_NO_AFM <nl> <nl> mmm a / thirdparty / freetype / src / psaux / afmparse . h <nl> ppp b / thirdparty / freetype / src / psaux / afmparse . h <nl> <nl> # define AFMPARSE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / psaux / cffdecode . c <nl> ppp b / thirdparty / freetype / src / psaux / cffdecode . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_SERVICE_H <nl> - # include FT_SERVICE_CFF_TABLE_LOAD_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftserv . h > <nl> + # include < freetype / internal / services / svcfftl . h > <nl> <nl> # include " cffdecode . h " <nl> # include " psobjs . h " <nl> mmm a / thirdparty / freetype / src / psaux / cffdecode . h <nl> ppp b / thirdparty / freetype / src / psaux / cffdecode . h <nl> <nl> # define CFFDECODE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / psaux / psarrst . c <nl> ppp b / thirdparty / freetype / src / psaux / psarrst . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psglue . h " <nl> # include " psarrst . h " <nl> mmm a / thirdparty / freetype / src / psaux / psaux . c <nl> ppp b / thirdparty / freetype / src / psaux / psaux . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " afmparse . c " <nl> # include " psauxmod . c " <nl> mmm a / thirdparty / freetype / src / psaux / psauxerr . h <nl> ppp b / thirdparty / freetype / src / psaux / psauxerr . h <nl> <nl> # ifndef PSAUXERR_H_ <nl> # define PSAUXERR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX PSaux_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_PSaux <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * PSAUXERR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / psaux / psauxmod . c <nl> ppp b / thirdparty / freetype / src / psaux / psauxmod . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " psauxmod . h " <nl> # include " psobjs . h " <nl> # include " t1decode . h " <nl> <nl> } ; <nl> <nl> <nl> - FT_CALLBACK_TABLE_DEF <nl> - const FT_Module_Class psaux_module_class = <nl> - { <nl> + FT_DEFINE_MODULE ( <nl> + psaux_module_class , <nl> + <nl> 0 , <nl> sizeof ( FT_ModuleRec ) , <nl> " psaux " , <nl> <nl> ( FT_Module_Constructor ) NULL , / * module_init * / <nl> ( FT_Module_Destructor ) NULL , / * module_done * / <nl> ( FT_Module_Requester ) NULL / * get_interface * / <nl> - } ; <nl> + ) <nl> <nl> <nl> / * END * / <nl> mmm a / thirdparty / freetype / src / psaux / psauxmod . h <nl> ppp b / thirdparty / freetype / src / psaux / psauxmod . h <nl> <nl> # define PSAUXMOD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> FT_CALLBACK_TABLE <nl> const PS_Builder_FuncsRec ps_builder_funcs ; <nl> <nl> + # ifndef T1_CONFIG_OPTION_NO_AFM <nl> + FT_CALLBACK_TABLE <nl> + const AFM_Parser_FuncsRec afm_parser_funcs ; <nl> + # endif <nl> + <nl> + FT_CALLBACK_TABLE <nl> + const T1_CMap_ClassesRec t1_cmap_classes ; <nl> + <nl> + FT_CALLBACK_TABLE <nl> + const CFF_Decoder_FuncsRec cff_decoder_funcs ; <nl> + <nl> <nl> FT_EXPORT_VAR ( const FT_Module_Class ) psaux_driver_class ; <nl> <nl> <nl> + FT_DECLARE_MODULE ( psaux_module_class ) <nl> + <nl> + <nl> FT_END_HEADER <nl> <nl> # endif / * PSAUXMOD_H_ * / <nl> mmm a / thirdparty / freetype / src / psaux / psblues . c <nl> ppp b / thirdparty / freetype / src / psaux / psblues . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psblues . h " <nl> # include " pshints . h " <nl> mmm a / thirdparty / freetype / src / psaux / psconv . c <nl> ppp b / thirdparty / freetype / src / psaux / psconv . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psconv . h " <nl> # include " psauxerr . h " <nl> mmm a / thirdparty / freetype / src / psaux / psconv . h <nl> ppp b / thirdparty / freetype / src / psaux / psconv . h <nl> <nl> # define PSCONV_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / psaux . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / psaux / pserror . h <nl> ppp b / thirdparty / freetype / src / psaux / pserror . h <nl> <nl> # define PSERROR_H_ <nl> <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_BASE FT_Mod_Err_CF2 <nl> <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> + # include < freetype / internal / compiler - macros . h > <nl> # include " psft . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / psaux / psfont . c <nl> ppp b / thirdparty / freetype / src / psaux / psfont . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_CALC_H <nl> + # include < freetype / internal / ftcalc . h > <nl> <nl> # include " psft . h " <nl> <nl> mmm a / thirdparty / freetype / src / psaux / psfont . h <nl> ppp b / thirdparty / freetype / src / psaux / psfont . h <nl> <nl> # define PSFONT_H_ <nl> <nl> <nl> - # include FT_SERVICE_CFF_TABLE_LOAD_H <nl> + # include < freetype / internal / services / svcfftl . h > <nl> <nl> # include " psft . h " <nl> # include " psblues . h " <nl> mmm a / thirdparty / freetype / src / psaux / psft . c <nl> ppp b / thirdparty / freetype / src / psaux / psft . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psfont . h " <nl> # include " pserror . h " <nl> <nl> # include " cffdecode . h " <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / services / svmm . h > <nl> # endif <nl> <nl> - # include FT_SERVICE_CFF_TABLE_LOAD_H <nl> + # include < freetype / internal / services / svcfftl . h > <nl> <nl> <nl> # define CF2_MAX_SIZE cf2_intToFixed ( 2000 ) / * max ppem * / <nl> mmm a / thirdparty / freetype / src / psaux / psft . h <nl> ppp b / thirdparty / freetype / src / psaux / psft . h <nl> <nl> # define PSFT_H_ <nl> <nl> <nl> + # include < freetype / internal / compiler - macros . h > <nl> # include " pstypes . h " <nl> <nl> - <nl> / * TODO : disable asserts for now * / <nl> # define CF2_NDEBUG <nl> <nl> <nl> - # include FT_SYSTEM_H <nl> + # include < freetype / ftsystem . h > <nl> <nl> # include " psglue . h " <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H / * for PS_Decoder * / <nl> + # include < freetype / internal / psaux . h > / * for PS_Decoder * / <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / psaux / pshints . c <nl> ppp b / thirdparty / freetype / src / psaux / pshints . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psglue . h " <nl> # include " psfont . h " <nl> <nl> CF2_Hint hint = & hintmap - > edge [ i ] ; <nl> <nl> <nl> - FT_TRACE6 ( ( " % 3d % 7 . 2f % 7 . 2f % 5d % s % s % s % s \ n " , <nl> + FT_TRACE6 ( ( " % 3ld % 7 . 2f % 7 . 2f % 5d % s % s % s % s \ n " , <nl> hint - > index , <nl> hint - > csCoord / 65536 . 0 , <nl> hint - > dsCoord / ( hint - > scale * 1 . 0 ) , <nl> mmm a / thirdparty / freetype / src / psaux / psintrp . c <nl> ppp b / thirdparty / freetype / src / psaux / psintrp . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_SERVICE_CFF_TABLE_LOAD_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / services / svcfftl . h > <nl> <nl> # include " psglue . h " <nl> # include " psfont . h " <nl> mmm a / thirdparty / freetype / src / psaux / psobjs . c <nl> ppp b / thirdparty / freetype / src / psaux / psobjs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " psobjs . h " <nl> # include " psconv . h " <nl> <nl> bbox - > xMax = FT_RoundFix ( temp [ 2 ] ) ; <nl> bbox - > yMax = FT_RoundFix ( temp [ 3 ] ) ; <nl> <nl> - FT_TRACE4 ( ( " [ % d % d % d % d ] " , <nl> + FT_TRACE4 ( ( " [ % ld % ld % ld % ld ] " , <nl> bbox - > xMin / 65536 , <nl> bbox - > yMin / 65536 , <nl> bbox - > xMax / 65536 , <nl> <nl> bbox - > xMax = FT_RoundFix ( temp [ i + 2 * max_objects ] ) ; <nl> bbox - > yMax = FT_RoundFix ( temp [ i + 3 * max_objects ] ) ; <nl> <nl> - FT_TRACE4 ( ( " [ % d % d % d % d ] " , <nl> + FT_TRACE4 ( ( " [ % ld % ld % ld % ld ] " , <nl> bbox - > xMin / 65536 , <nl> bbox - > yMin / 65536 , <nl> bbox - > xMax / 65536 , <nl> mmm a / thirdparty / freetype / src / psaux / psobjs . h <nl> ppp b / thirdparty / freetype / src / psaux / psobjs . h <nl> <nl> # define PSOBJS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_CFF_OBJECTS_TYPES_H <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / cffotypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / psaux / psread . c <nl> ppp b / thirdparty / freetype / src / psaux / psread . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psglue . h " <nl> <nl> mmm a / thirdparty / freetype / src / psaux / psstack . c <nl> ppp b / thirdparty / freetype / src / psaux / psstack . c <nl> <nl> <nl> <nl> # include " psft . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psglue . h " <nl> # include " psfont . h " <nl> <nl> CF2_Stack stack = NULL ; <nl> <nl> <nl> - if ( ! FT_NEW ( stack ) ) <nl> - { <nl> - / * initialize the structure ; FT_NEW zeroes it * / <nl> - stack - > memory = memory ; <nl> - stack - > error = e ; <nl> - } <nl> + if ( FT_NEW ( stack ) ) <nl> + return NULL ; <nl> + <nl> + / * initialize the structure ; FT_NEW zeroes it * / <nl> + stack - > memory = memory ; <nl> + stack - > error = e ; <nl> <nl> / * allocate the stack buffer * / <nl> if ( FT_NEW_ARRAY ( stack - > buffer , stackSize ) ) <nl> mmm a / thirdparty / freetype / src / psaux / psstack . h <nl> ppp b / thirdparty / freetype / src / psaux / psstack . h <nl> <nl> # ifndef PSSTACK_H_ <nl> # define PSSTACK_H_ <nl> <nl> + # include < freetype / internal / compiler - macros . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / psaux / pstypes . h <nl> ppp b / thirdparty / freetype / src / psaux / pstypes . h <nl> <nl> # ifndef PSTYPES_H_ <nl> # define PSTYPES_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> + # include < freetype / freetype . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / psaux / t1cmap . c <nl> ppp b / thirdparty / freetype / src / psaux / t1cmap . c <nl> <nl> <nl> # include " t1cmap . h " <nl> <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> # include " psauxerr . h " <nl> <nl> mmm a / thirdparty / freetype / src / psaux / t1cmap . h <nl> ppp b / thirdparty / freetype / src / psaux / t1cmap . h <nl> <nl> # ifndef T1CMAP_H_ <nl> # define T1CMAP_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / t1types . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / psaux / t1decode . c <nl> ppp b / thirdparty / freetype / src / psaux / t1decode . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> - # include FT_INTERNAL_HASH_H <nl> - # include FT_OUTLINE_H <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / pshints . h > <nl> + # include < freetype / internal / fthash . h > <nl> + # include < freetype / ftoutln . h > <nl> <nl> # include " t1decode . h " <nl> # include " psobjs . h " <nl> <nl> <nl> FT_UNUSED ( orig_y ) ; <nl> <nl> - / * the ` metrics_only ' indicates that we only want to compute * / <nl> - / * the glyph ' s metrics ( lsb + advance width ) , not load the * / <nl> + / * ` metrics_only ' indicates that we only want to compute the * / <nl> + / * glyph ' s metrics ( lsb + advance width ) without loading the * / <nl> / * rest of it ; so exit immediately * / <nl> if ( builder - > metrics_only ) <nl> { <nl> <nl> x = ADD_LONG ( builder - > pos_x , top [ 0 ] ) ; <nl> y = ADD_LONG ( builder - > pos_y , top [ 1 ] ) ; <nl> <nl> - / * the ` metrics_only ' indicates that we only want to compute * / <nl> - / * the glyph ' s metrics ( lsb + advance width ) , not load the * / <nl> + / * ` metrics_only ' indicates that we only want to compute the * / <nl> + / * glyph ' s metrics ( lsb + advance width ) without loading the * / <nl> / * rest of it ; so exit immediately * / <nl> if ( builder - > metrics_only ) <nl> { <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> if ( bol ) <nl> { <nl> - FT_TRACE5 ( ( " ( % d ) " , decoder - > top - decoder - > stack ) ) ; <nl> + FT_TRACE5 ( ( " ( % ld ) " , decoder - > top - decoder - > stack ) ) ; <nl> bol = FALSE ; <nl> } <nl> # endif <nl> <nl> case 7 : <nl> case 8 : <nl> case 9 : <nl> - case 10 : <nl> - case 11 : <nl> case 14 : <nl> case 15 : <nl> case 21 : <nl> <nl> case 31 : <nl> goto No_Width ; <nl> <nl> + case 10 : <nl> + op = op_callsubr ; <nl> + break ; <nl> + case 11 : <nl> + op = op_return ; <nl> + break ; <nl> + <nl> case 13 : <nl> op = op_hsbw ; <nl> break ; <nl> <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> <nl> - if ( op ! = op_div ) <nl> + switch ( op ) <nl> { <nl> + case op_callsubr : <nl> + case op_div : <nl> + case op_return : <nl> + break ; <nl> + <nl> + default : <nl> if ( top - decoder - > stack ! = num_args ) <nl> FT_TRACE0 ( ( " t1_decoder_parse_metrics : " <nl> " too much operands on the stack " <nl> - " ( seen % d , expected % d ) \ n " , <nl> + " ( seen % ld , expected % d ) \ n " , <nl> top - decoder - > stack , num_args ) ) ; <nl> + break ; <nl> } <nl> <nl> # endif / * FT_DEBUG_LEVEL_TRACE * / <nl> <nl> builder - > advance . y = 0 ; <nl> <nl> / * we only want to compute the glyph ' s metrics * / <nl> - / * ( lsb + advance width ) , not load the rest of * / <nl> - / * it ; so exit immediately * / <nl> + / * ( lsb + advance width ) without loading the * / <nl> + / * rest of it ; so exit immediately * / <nl> FT_TRACE4 ( ( " \ n " ) ) ; <nl> return FT_Err_Ok ; <nl> <nl> <nl> builder - > advance . y = top [ 3 ] ; <nl> <nl> / * we only want to compute the glyph ' s metrics * / <nl> - / * ( lsb + advance width ) , not load the rest of * / <nl> - / * it ; so exit immediately * / <nl> + / * ( lsb + advance width ) , without loading the * / <nl> + / * rest of it ; so exit immediately * / <nl> FT_TRACE4 ( ( " \ n " ) ) ; <nl> return FT_Err_Ok ; <nl> <nl> <nl> large_int = FALSE ; <nl> break ; <nl> <nl> + case op_callsubr : <nl> + { <nl> + FT_Int idx ; <nl> + <nl> + <nl> + FT_TRACE4 ( ( " callsubr " ) ) ; <nl> + <nl> + idx = Fix2Int ( top [ 0 ] ) ; <nl> + <nl> + if ( decoder - > subrs_hash ) <nl> + { <nl> + size_t * val = ft_hash_num_lookup ( idx , <nl> + decoder - > subrs_hash ) ; <nl> + <nl> + <nl> + if ( val ) <nl> + idx = * val ; <nl> + else <nl> + idx = - 1 ; <nl> + } <nl> + <nl> + if ( idx < 0 | | idx > = decoder - > num_subrs ) <nl> + { <nl> + FT_ERROR ( ( " t1_decoder_parse_metrics : " <nl> + " invalid subrs index \ n " ) ) ; <nl> + goto Syntax_Error ; <nl> + } <nl> + <nl> + if ( zone - decoder - > zones > = T1_MAX_SUBRS_CALLS ) <nl> + { <nl> + FT_ERROR ( ( " t1_decoder_parse_metrics : " <nl> + " too many nested subrs \ n " ) ) ; <nl> + goto Syntax_Error ; <nl> + } <nl> + <nl> + zone - > cursor = ip ; / * save current instruction pointer * / <nl> + <nl> + zone + + ; <nl> + <nl> + / * The Type 1 driver stores subroutines without the seed bytes . * / <nl> + / * The CID driver stores subroutines with seed bytes . This * / <nl> + / * case is taken care of when decoder - > subrs_len = = 0 . * / <nl> + zone - > base = decoder - > subrs [ idx ] ; <nl> + <nl> + if ( decoder - > subrs_len ) <nl> + zone - > limit = zone - > base + decoder - > subrs_len [ idx ] ; <nl> + else <nl> + { <nl> + / * We are using subroutines from a CID font . We must adjust * / <nl> + / * for the seed bytes . * / <nl> + zone - > base + = ( decoder - > lenIV > = 0 ? decoder - > lenIV : 0 ) ; <nl> + zone - > limit = decoder - > subrs [ idx + 1 ] ; <nl> + } <nl> + <nl> + zone - > cursor = zone - > base ; <nl> + <nl> + if ( ! zone - > base ) <nl> + { <nl> + FT_ERROR ( ( " t1_decoder_parse_metrics : " <nl> + " invoking empty subrs \ n " ) ) ; <nl> + goto Syntax_Error ; <nl> + } <nl> + <nl> + decoder - > zone = zone ; <nl> + ip = zone - > base ; <nl> + limit = zone - > limit ; <nl> + break ; <nl> + } <nl> + <nl> + case op_return : <nl> + FT_TRACE4 ( ( " return " ) ) ; <nl> + <nl> + if ( zone < = decoder - > zones ) <nl> + { <nl> + FT_ERROR ( ( " t1_decoder_parse_metrics : " <nl> + " unexpected return \ n " ) ) ; <nl> + goto Syntax_Error ; <nl> + } <nl> + <nl> + zone - - ; <nl> + ip = zone - > cursor ; <nl> + limit = zone - > limit ; <nl> + decoder - > zone = zone ; <nl> + break ; <nl> + <nl> default : <nl> FT_ERROR ( ( " t1_decoder_parse_metrics : " <nl> " unhandled opcode % d \ n " , op ) ) ; <nl> mmm a / thirdparty / freetype / src / psaux / t1decode . h <nl> ppp b / thirdparty / freetype / src / psaux / t1decode . h <nl> <nl> # define T1DECODE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / t1types . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pshinter / pshalgo . c <nl> ppp b / thirdparty / freetype / src / pshinter / pshalgo . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> # include " pshalgo . h " <nl> <nl> # include " pshnterr . h " <nl> mmm a / thirdparty / freetype / src / pshinter / pshglob . c <nl> ppp b / thirdparty / freetype / src / pshinter / pshglob . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_CALC_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> # include " pshglob . h " <nl> <nl> # ifdef DEBUG_HINTER <nl> mmm a / thirdparty / freetype / src / pshinter / pshglob . h <nl> ppp b / thirdparty / freetype / src / pshinter / pshglob . h <nl> <nl> # define PSHGLOB_H_ <nl> <nl> <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / pshints . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pshinter / pshinter . c <nl> ppp b / thirdparty / freetype / src / pshinter / pshinter . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " pshalgo . c " <nl> # include " pshglob . c " <nl> mmm a / thirdparty / freetype / src / pshinter / pshmod . c <nl> ppp b / thirdparty / freetype / src / pshinter / pshmod . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> # include " pshrec . h " <nl> # include " pshalgo . h " <nl> + # include " pshmod . h " <nl> <nl> <nl> / * the Postscript Hinter module structure * / <nl> mmm a / thirdparty / freetype / src / pshinter / pshmod . h <nl> ppp b / thirdparty / freetype / src / pshinter / pshmod . h <nl> <nl> # define PSHMOD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / pshinter / pshnterr . h <nl> ppp b / thirdparty / freetype / src / pshinter / pshnterr . h <nl> <nl> # ifndef PSHNTERR_H_ <nl> # define PSHNTERR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX PSH_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_PShinter <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * PSHNTERR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / pshinter / pshrec . c <nl> ppp b / thirdparty / freetype / src / pshinter / pshrec . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> <nl> # include " pshrec . h " <nl> # include " pshalgo . h " <nl> <nl> if ( error ) <nl> { <nl> FT_ERROR ( ( " ps_hints_stem : could not add stem " <nl> - " ( % d , % d ) to hints table \ n " , stems [ 0 ] , stems [ 1 ] ) ) ; <nl> + " ( % ld , % ld ) to hints table \ n " , stems [ 0 ] , stems [ 1 ] ) ) ; <nl> <nl> hints - > error = error ; <nl> return ; <nl> mmm a / thirdparty / freetype / src / pshinter / pshrec . h <nl> ppp b / thirdparty / freetype / src / pshinter / pshrec . h <nl> <nl> # define PSHREC_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> + # include < freetype / internal / pshints . h > <nl> # include " pshglob . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / psnames / psmodule . c <nl> ppp b / thirdparty / freetype / src / psnames / psmodule . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> <nl> # include " psmodule . h " <nl> <nl> mmm a / thirdparty / freetype / src / psnames / psmodule . h <nl> ppp b / thirdparty / freetype / src / psnames / psmodule . h <nl> <nl> # define PSMODULE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / psnames / psnamerr . h <nl> ppp b / thirdparty / freetype / src / psnames / psnamerr . h <nl> <nl> # ifndef PSNAMERR_H_ <nl> # define PSNAMERR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX PSnames_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_PSnames <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * PSNAMERR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / psnames / psnames . c <nl> ppp b / thirdparty / freetype / src / psnames / psnames . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " psmodule . c " <nl> <nl> mmm a / thirdparty / freetype / src / raster / ftraster . c <nl> ppp b / thirdparty / freetype / src / raster / ftraster . c <nl> <nl> <nl> # else / * ! STANDALONE_ * / <nl> <nl> - # include < ft2build . h > <nl> # include " ftraster . h " <nl> - # include FT_INTERNAL_CALC_H / * for FT_MulDiv and FT_MulDiv_No_Round * / <nl> - # include FT_OUTLINE_H / * for FT_Outline_Get_CBox * / <nl> + # include < freetype / internal / ftcalc . h > / * for FT_MulDiv and FT_MulDiv_No_Round * / <nl> + # include < freetype / ftoutln . h > / * for FT_Outline_Get_CBox * / <nl> <nl> # endif / * ! STANDALONE_ * / <nl> <nl> <nl> # else / * ! STANDALONE_ * / <nl> <nl> <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H / * for FT_TRACE , FT_ERROR , and FT_THROW * / <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > / * for FT_TRACE , FT_ERROR , and FT_THROW * / <nl> <nl> # include " rasterrs . h " <nl> <nl> <nl> # define IS_TOP_OVERSHOOT ( x ) \ <nl> ( Bool ) ( x - FLOOR ( x ) > = ras . precision_half ) <nl> <nl> + / * Smart dropout rounding to find which pixel is closer to span ends . * / <nl> + / * To mimick Windows , symmetric cases break down indepenently of the * / <nl> + / * precision . * / <nl> + # define SMART ( p , q ) FLOOR ( ( ( p ) + ( q ) + ras . precision * 63 / 64 ) > > 1 ) <nl> + <nl> # if FT_RENDER_POOL_SIZE > 2048 <nl> # define FT_MAX_BLACK_POOL ( FT_RENDER_POOL_SIZE / sizeof ( Long ) ) <nl> # else <nl> <nl> if ( overshoot ) <nl> ras . cProfile - > flags | = Overshoot_Bottom ; <nl> <nl> - FT_TRACE6 ( ( " new ascending profile = % p \ n " , ras . cProfile ) ) ; <nl> + FT_TRACE6 ( ( " new ascending profile = % p \ n " , ( void * ) ras . cProfile ) ) ; <nl> break ; <nl> <nl> case Descending_State : <nl> if ( overshoot ) <nl> ras . cProfile - > flags | = Overshoot_Top ; <nl> - FT_TRACE6 ( ( " new descending profile = % p \ n " , ras . cProfile ) ) ; <nl> + FT_TRACE6 ( ( " new descending profile = % p \ n " , ( void * ) ras . cProfile ) ) ; <nl> break ; <nl> <nl> default : <nl> <nl> <nl> <nl> FT_TRACE6 ( ( " ending profile % p , start = % ld , height = % ld \ n " , <nl> - ras . cProfile , ras . cProfile - > start , h ) ) ; <nl> + ( void * ) ras . cProfile , ras . cProfile - > start , h ) ) ; <nl> <nl> ras . cProfile - > height = h ; <nl> if ( overshoot ) <nl> <nl> <nl> / * in high - precision mode , we need 12 digits after the comma to * / <nl> / * represent multiples of 1 / ( 1 < < 12 ) = 1 / 4096 * / <nl> - FT_TRACE7 ( ( " y = % d x = [ % . 12f ; % . 12f ] , drop - out = % d " , <nl> + FT_TRACE7 ( ( " y = % d x = [ % . 12f ; % . 12f ] " , <nl> y , <nl> x1 / ( double ) ras . precision , <nl> - x2 / ( double ) ras . precision , <nl> - dropOutControl ) ) ; <nl> + x2 / ( double ) ras . precision ) ) ; <nl> <nl> / * Drop - out control * / <nl> <nl> <nl> if ( e2 > = ras . bWidth ) <nl> e2 = ras . bWidth - 1 ; <nl> <nl> - FT_TRACE7 ( ( " - > x = [ % d ; % d ] " , e1 , e2 ) ) ; <nl> + FT_TRACE7 ( ( " - > x = [ % ld ; % ld ] " , e1 , e2 ) ) ; <nl> <nl> c1 = ( Short ) ( e1 > > 3 ) ; <nl> c2 = ( Short ) ( e2 > > 3 ) ; <nl> <nl> Short c1 , f1 ; <nl> <nl> <nl> - FT_TRACE7 ( ( " y = % d x = [ % . 12f ; % . 12f ] " , <nl> + FT_TRACE7 ( ( " y = % d x = [ % . 12f ; % . 12f ] " , <nl> y , <nl> x1 / ( double ) ras . precision , <nl> x2 / ( double ) ras . precision ) ) ; <nl> <nl> Int dropOutControl = left - > flags & 7 ; <nl> <nl> <nl> - FT_TRACE7 ( ( " , drop - out = % d " , dropOutControl ) ) ; <nl> - <nl> if ( e1 = = e2 + ras . precision ) <nl> { <nl> switch ( dropOutControl ) <nl> <nl> break ; <nl> <nl> case 4 : / * smart drop - outs including stubs * / <nl> - pxl = FLOOR ( ( x1 + x2 - 1 ) / 2 + ras . precision_half ) ; <nl> + pxl = SMART ( x1 , x2 ) ; <nl> break ; <nl> <nl> case 1 : / * simple drop - outs excluding stubs * / <nl> <nl> if ( dropOutControl = = 1 ) <nl> pxl = e2 ; <nl> else <nl> - pxl = FLOOR ( ( x1 + x2 - 1 ) / 2 + ras . precision_half ) ; <nl> + pxl = SMART ( x1 , x2 ) ; <nl> break ; <nl> <nl> default : / * modes 2 , 3 , 6 , 7 * / <nl> <nl> <nl> if ( e1 > = 0 & & e1 < ras . bWidth ) <nl> { <nl> - FT_TRACE7 ( ( " - > x = % d ( drop - out ) " , e1 ) ) ; <nl> + FT_TRACE7 ( ( " - > x = % ld " , e1 ) ) ; <nl> <nl> c1 = ( Short ) ( e1 > > 3 ) ; <nl> f1 = ( Short ) ( e1 & 7 ) ; <nl> <nl> } <nl> <nl> Exit : <nl> - FT_TRACE7 ( ( " \ n " ) ) ; <nl> + FT_TRACE7 ( ( " dropout = % d \ n " , left - > flags & 7 ) ) ; <nl> } <nl> <nl> <nl> <nl> PProfile left , <nl> PProfile right ) <nl> { <nl> + Long e1 , e2 ; <nl> + <nl> FT_UNUSED ( left ) ; <nl> FT_UNUSED ( right ) ; <nl> <nl> <nl> - if ( x2 - x1 < ras . precision ) <nl> - { <nl> - Long e1 , e2 ; <nl> + FT_TRACE7 ( ( " x = % d y = [ % . 12f ; % . 12f ] " , <nl> + y , <nl> + x1 / ( double ) ras . precision , <nl> + x2 / ( double ) ras . precision ) ) ; <nl> <nl> + / * We should not need this procedure but the vertical sweep * / <nl> + / * mishandles horizontal lines through pixel centers . So we * / <nl> + / * have to check perfectly aligned span edges here . * / <nl> + / * * / <nl> + / * XXX : Can we handle horizontal lines better and drop this ? * / <nl> <nl> - FT_TRACE7 ( ( " x = % d y = [ % . 12f ; % . 12f ] " , <nl> - y , <nl> - x1 / ( double ) ras . precision , <nl> - x2 / ( double ) ras . precision ) ) ; <nl> + e1 = CEILING ( x1 ) ; <nl> <nl> - e1 = CEILING ( x1 ) ; <nl> - e2 = FLOOR ( x2 ) ; <nl> + if ( x1 = = e1 ) <nl> + { <nl> + e1 = TRUNC ( e1 ) ; <nl> <nl> - if ( e1 = = e2 ) <nl> + if ( e1 > = 0 & & ( ULong ) e1 < ras . target . rows ) <nl> { <nl> - e1 = TRUNC ( e1 ) ; <nl> - <nl> - if ( e1 > = 0 & & ( ULong ) e1 < ras . target . rows ) <nl> - { <nl> - Byte f1 ; <nl> - PByte bits ; <nl> + Byte f1 ; <nl> + PByte bits ; <nl> <nl> <nl> - FT_TRACE7 ( ( " - > y = % d ( drop - out ) " , e1 ) ) ; <nl> + bits = ras . bOrigin + ( y > > 3 ) - e1 * ras . target . pitch ; <nl> + f1 = ( Byte ) ( 0x80 > > ( y & 7 ) ) ; <nl> <nl> - bits = ras . bOrigin + ( y > > 3 ) - e1 * ras . target . pitch ; <nl> - f1 = ( Byte ) ( 0x80 > > ( y & 7 ) ) ; <nl> + FT_TRACE7 ( ( bits [ 0 ] & f1 ? " redundant " <nl> + : " - > y = % ld edge " , e1 ) ) ; <nl> <nl> - bits [ 0 ] | = f1 ; <nl> - } <nl> + bits [ 0 ] | = f1 ; <nl> } <nl> + } <nl> + <nl> + e2 = FLOOR ( x2 ) ; <nl> + <nl> + if ( x2 = = e2 ) <nl> + { <nl> + e2 = TRUNC ( e2 ) ; <nl> + <nl> + if ( e2 > = 0 & & ( ULong ) e2 < ras . target . rows ) <nl> + { <nl> + Byte f1 ; <nl> + PByte bits ; <nl> + <nl> <nl> - FT_TRACE7 ( ( " \ n " ) ) ; <nl> + bits = ras . bOrigin + ( y > > 3 ) - e2 * ras . target . pitch ; <nl> + f1 = ( Byte ) ( 0x80 > > ( y & 7 ) ) ; <nl> + <nl> + FT_TRACE7 ( ( bits [ 0 ] & f1 ? " redundant " <nl> + : " - > y = % ld edge " , e2 ) ) ; <nl> + <nl> + bits [ 0 ] | = f1 ; <nl> + } <nl> } <nl> + <nl> + FT_TRACE7 ( ( " \ n " ) ) ; <nl> } <nl> <nl> <nl> <nl> Byte f1 ; <nl> <nl> <nl> - FT_TRACE7 ( ( " x = % d y = [ % . 12f ; % . 12f ] " , <nl> + FT_TRACE7 ( ( " x = % d y = [ % . 12f ; % . 12f ] " , <nl> y , <nl> x1 / ( double ) ras . precision , <nl> x2 / ( double ) ras . precision ) ) ; <nl> <nl> Int dropOutControl = left - > flags & 7 ; <nl> <nl> <nl> - FT_TRACE7 ( ( " , dropout = % d " , dropOutControl ) ) ; <nl> - <nl> if ( e1 = = e2 + ras . precision ) <nl> { <nl> switch ( dropOutControl ) <nl> <nl> break ; <nl> <nl> case 4 : / * smart drop - outs including stubs * / <nl> - pxl = FLOOR ( ( x1 + x2 - 1 ) / 2 + ras . precision_half ) ; <nl> + pxl = SMART ( x1 , x2 ) ; <nl> break ; <nl> <nl> case 1 : / * simple drop - outs excluding stubs * / <nl> <nl> if ( dropOutControl = = 1 ) <nl> pxl = e2 ; <nl> else <nl> - pxl = FLOOR ( ( x1 + x2 - 1 ) / 2 + ras . precision_half ) ; <nl> + pxl = SMART ( x1 , x2 ) ; <nl> break ; <nl> <nl> default : / * modes 2 , 3 , 6 , 7 * / <nl> <nl> <nl> if ( e1 > = 0 & & ( ULong ) e1 < ras . target . rows ) <nl> { <nl> - FT_TRACE7 ( ( " - > y = % d ( drop - out ) " , e1 ) ) ; <nl> + FT_TRACE7 ( ( " - > y = % ld " , e1 ) ) ; <nl> <nl> bits = ras . bOrigin + ( y > > 3 ) - e1 * ras . target . pitch ; <nl> f1 = ( Byte ) ( 0x80 > > ( y & 7 ) ) ; <nl> <nl> } <nl> <nl> Exit : <nl> - FT_TRACE7 ( ( " \ n " ) ) ; <nl> + FT_TRACE7 ( ( " dropout = % d \ n " , left - > flags & 7 ) ) ; <nl> } <nl> <nl> <nl> mmm a / thirdparty / freetype / src / raster / ftraster . h <nl> ppp b / thirdparty / freetype / src / raster / ftraster . h <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_IMAGE_H <nl> + # include < freetype / ftimage . h > <nl> <nl> + # include < freetype / internal / compiler - macros . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / raster / ftrend1 . c <nl> ppp b / thirdparty / freetype / src / raster / ftrend1 . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_OUTLINE_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftoutln . h > <nl> # include " ftrend1 . h " <nl> # include " ftraster . h " <nl> <nl> mmm a / thirdparty / freetype / src / raster / ftrend1 . h <nl> ppp b / thirdparty / freetype / src / raster / ftrend1 . h <nl> <nl> # define FTREND1_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_RENDER_H <nl> + # include < freetype / ftrender . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / raster / raster . c <nl> ppp b / thirdparty / freetype / src / raster / raster . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " ftraster . c " <nl> # include " ftrend1 . c " <nl> mmm a / thirdparty / freetype / src / raster / rasterrs . h <nl> ppp b / thirdparty / freetype / src / raster / rasterrs . h <nl> <nl> # ifndef RASTERRS_H_ <nl> # define RASTERRS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX Raster_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Raster <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * RASTERRS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / pngshim . c <nl> ppp b / thirdparty / freetype / src / sfnt / pngshim . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> # include FT_CONFIG_STANDARD_LIBRARY_H <nl> <nl> <nl> <nl> / * predates clang ; the ` __BYTE_ORDER__ ' preprocessor symbol was * / <nl> / * introduced in gcc 4 . 6 and clang 3 . 2 , respectively . * / <nl> / * ` __builtin_shuffle ' for gcc was introduced in gcc 4 . 7 . 0 . * / <nl> - # if ( ( defined ( __GNUC__ ) & & \ <nl> + / * * / <nl> + / * Intel compilers do not currently support __builtin_shuffle ; * / <nl> + <nl> + / * The Intel check must be first . * / <nl> + # if ! defined ( __INTEL_COMPILER ) & & \ <nl> + ( ( defined ( __GNUC__ ) & & \ <nl> ( ( __GNUC__ > = 5 ) | | \ <nl> ( ( __GNUC__ = = 4 ) & & ( __GNUC_MINOR__ > = 7 ) ) ) ) | | \ <nl> ( defined ( __clang__ ) & & \ <nl> <nl> <nl> if ( populate_map_and_metrics ) <nl> { <nl> + / * reject too large bitmaps similarly to the rasterizer * / <nl> + if ( imgHeight > 0x7FFF | | imgWidth > 0x7FFF ) <nl> + { <nl> + error = FT_THROW ( Array_Too_Large ) ; <nl> + goto DestroyExit ; <nl> + } <nl> + <nl> metrics - > width = ( FT_UShort ) imgWidth ; <nl> metrics - > height = ( FT_UShort ) imgHeight ; <nl> <nl> <nl> map - > pixel_mode = FT_PIXEL_MODE_BGRA ; <nl> map - > pitch = ( int ) ( map - > width * 4 ) ; <nl> map - > num_grays = 256 ; <nl> - <nl> - / * reject too large bitmaps similarly to the rasterizer * / <nl> - if ( map - > rows > 0x7FFF | | map - > width > 0x7FFF ) <nl> - { <nl> - error = FT_THROW ( Array_Too_Large ) ; <nl> - goto DestroyExit ; <nl> - } <nl> } <nl> <nl> / * convert palette / gray image to rgb * / <nl> mmm a / thirdparty / freetype / src / sfnt / pngshim . h <nl> ppp b / thirdparty / freetype / src / sfnt / pngshim . h <nl> <nl> # define PNGSHIM_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttload . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / sfdriver . c <nl> ppp b / thirdparty / freetype / src / sfnt / sfdriver . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_TRUETYPE_IDS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ttnameid . h > <nl> <nl> # include " sfdriver . h " <nl> # include " ttload . h " <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_BDF <nl> # include " ttbdf . h " <nl> - # include FT_SERVICE_BDF_H <nl> + # include < freetype / internal / services / svbdf . h > <nl> # endif <nl> <nl> # include " ttcmap . h " <nl> # include " ttkern . h " <nl> # include " ttmtx . h " <nl> <nl> - # include FT_SERVICE_GLYPH_DICT_H <nl> - # include FT_SERVICE_POSTSCRIPT_NAME_H <nl> - # include FT_SERVICE_SFNT_H <nl> - # include FT_SERVICE_TT_CMAP_H <nl> + # include < freetype / internal / services / svgldict . h > <nl> + # include < freetype / internal / services / svpostnm . h > <nl> + # include < freetype / internal / services / svsfnt . h > <nl> + # include < freetype / internal / services / svttcmap . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / services / svmm . h > <nl> # endif <nl> <nl> <nl> <nl> else if ( ( FT_ULong ) face - > num_glyphs < FT_UINT_MAX ) <nl> max_gid = ( FT_UInt ) face - > num_glyphs ; <nl> else <nl> - FT_TRACE0 ( ( " Ignore glyph names for invalid GID 0x % 08x - 0x % 08x \ n " , <nl> + FT_TRACE0 ( ( " Ignore glyph names for invalid GID 0x % 08x - 0x % 08lx \ n " , <nl> FT_UINT_MAX , face - > num_glyphs ) ) ; <nl> <nl> for ( i = 0 ; i < max_gid ; i + + ) <nl> mmm a / thirdparty / freetype / src / sfnt / sfdriver . h <nl> ppp b / thirdparty / freetype / src / sfnt / sfdriver . h <nl> <nl> # define SFDRIVER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_MODULE_H <nl> + # include < freetype / ftmodapi . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / sferrors . h <nl> ppp b / thirdparty / freetype / src / sfnt / sferrors . h <nl> <nl> # ifndef SFERRORS_H_ <nl> # define SFERRORS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX SFNT_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_SFNT <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * SFERRORS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / sfnt . c <nl> ppp b / thirdparty / freetype / src / sfnt / sfnt . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " pngshim . c " <nl> # include " sfdriver . c " <nl> mmm a / thirdparty / freetype / src / sfnt / sfobjs . c <nl> ppp b / thirdparty / freetype / src / sfnt / sfobjs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " sfobjs . h " <nl> # include " ttload . h " <nl> # include " ttcmap . h " <nl> # include " ttkern . h " <nl> # include " sfwoff . h " <nl> # include " sfwoff2 . h " <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_TRUETYPE_IDS_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_SFNT_NAMES_H <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ttnameid . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / ftsnames . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_METRICS_VARIATIONS_H <nl> + # include < freetype / internal / services / svmm . h > <nl> + # include < freetype / internal / services / svmetric . h > <nl> # endif <nl> <nl> # include " sferrors . h " <nl> <nl> / * Stream may have changed in sfnt_open_font . * / <nl> stream = face - > root . stream ; <nl> <nl> - FT_TRACE2 ( ( " sfnt_init_face : % 08p ( index % d ) \ n " , <nl> - face , <nl> + FT_TRACE2 ( ( " sfnt_init_face : % p ( index % d ) \ n " , <nl> + ( void * ) face , <nl> face_instance_index ) ) ; <nl> <nl> face_index = FT_ABS ( face_instance_index ) & 0xFFFF ; <nl> <nl> / * it doesn ' t contain outlines . * / <nl> / * * / <nl> <nl> - FT_TRACE2 ( ( " sfnt_load_face : % 08p \ n \ n " , face ) ) ; <nl> + FT_TRACE2 ( ( " sfnt_load_face : % p \ n \ n " , ( void * ) face ) ) ; <nl> <nl> / * do we have outlines in there ? * / <nl> # ifdef FT_CONFIG_OPTION_INCREMENTAL <nl> mmm a / thirdparty / freetype / src / sfnt / sfobjs . h <nl> ppp b / thirdparty / freetype / src / sfnt / sfobjs . h <nl> <nl> # define SFOBJS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / sfwoff . c <nl> ppp b / thirdparty / freetype / src / sfnt / sfwoff . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " sfwoff . h " <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_GZIP_H <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / ftgzip . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / sfnt / sfwoff . h <nl> ppp b / thirdparty / freetype / src / sfnt / sfwoff . h <nl> <nl> # define SFWOFF_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / sfwoff2 . c <nl> ppp b / thirdparty / freetype / src / sfnt / sfwoff2 . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> # include " sfwoff2 . h " <nl> # include " woff2tags . h " <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> # ifdef FT_CONFIG_OPTION_USE_BROTLI <nl> <nl> <nl> # define READ_BASE128 ( var ) FT_SET_ERROR ( ReadBase128 ( stream , & var ) ) <nl> <nl> - # define ROUND4 ( var ) ( ( var + 3 ) & ~ 3 ) <nl> + / * ` var ' should be FT_ULong * / <nl> + # define ROUND4 ( var ) ( ( var + 3 ) & ~ 3UL ) <nl> <nl> # define WRITE_USHORT ( p , v ) \ <nl> do \ <nl> <nl> \ <nl> } while ( 0 ) <nl> <nl> - # define WRITE_SHORT ( p , v ) \ <nl> - do \ <nl> - { \ <nl> - * ( p ) + + = ( ( v ) > > 8 ) ; \ <nl> - * ( p ) + + = ( ( v ) > > 0 ) ; \ <nl> - \ <nl> + # define WRITE_SHORT ( p , v ) \ <nl> + do \ <nl> + { \ <nl> + * ( p ) + + = ( FT_Byte ) ( ( v ) > > 8 ) ; \ <nl> + * ( p ) + + = ( FT_Byte ) ( ( v ) > > 0 ) ; \ <nl> + \ <nl> } while ( 0 ) <nl> <nl> # define WRITE_SFNT_BUF ( buf , s ) \ <nl> <nl> Read255UShort ( FT_Stream stream , <nl> FT_UShort * value ) <nl> { <nl> - static const FT_Int oneMoreByteCode1 = 255 ; <nl> - static const FT_Int oneMoreByteCode2 = 254 ; <nl> - static const FT_Int wordCode = 253 ; <nl> - static const FT_Int lowestUCode = 253 ; <nl> + const FT_Byte oneMoreByteCode1 = 255 ; <nl> + const FT_Byte oneMoreByteCode2 = 254 ; <nl> + const FT_Byte wordCode = 253 ; <nl> + const FT_UShort lowestUCode = 253 ; <nl> <nl> FT_Error error = FT_Err_Ok ; <nl> FT_Byte code ; <nl> <nl> <nl> <nl> / * Calculate table checksum of ` buf ' . * / <nl> - static FT_Long <nl> + static FT_ULong <nl> compute_ULong_sum ( FT_Byte * buf , <nl> FT_ULong size ) <nl> { <nl> FT_ULong checksum = 0 ; <nl> - FT_ULong aligned_size = size & ~ 3 ; <nl> + FT_ULong aligned_size = size & ~ 3UL ; <nl> FT_ULong i ; <nl> FT_ULong v ; <nl> <nl> <nl> { <nl> # ifdef FT_CONFIG_OPTION_USE_BROTLI <nl> <nl> - FT_ULong uncompressed_size = dst_size ; <nl> + / * this cast is only of importance on 32bit systems ; * / <nl> + / * we don ' t validate it * / <nl> + FT_Offset uncompressed_size = ( FT_Offset ) dst_size ; <nl> BrotliDecoderResult result ; <nl> <nl> <nl> <nl> FT_ULong * glyph_size ) <nl> { <nl> FT_UInt flag_offset = 10 + ( 2 * n_contours ) + 2 + instruction_len ; <nl> - FT_Int last_flag = - 1 ; <nl> - FT_Int repeat_count = 0 ; <nl> - FT_Int last_x = 0 ; <nl> - FT_Int last_y = 0 ; <nl> - FT_UInt x_bytes = 0 ; <nl> - FT_UInt y_bytes = 0 ; <nl> + FT_Byte last_flag = 0xFFU ; <nl> + FT_Byte repeat_count = 0 ; <nl> + FT_Int last_x = 0 ; <nl> + FT_Int last_y = 0 ; <nl> + FT_UInt x_bytes = 0 ; <nl> + FT_UInt y_bytes = 0 ; <nl> FT_UInt xy_bytes ; <nl> FT_UInt i ; <nl> FT_UInt x_offset ; <nl> <nl> { <nl> const WOFF2_PointRec point = points [ i ] ; <nl> <nl> - FT_Int flag = point . on_curve ? GLYF_ON_CURVE : 0 ; <nl> - FT_Int dx = point . x - last_x ; <nl> - FT_Int dy = point . y - last_y ; <nl> + FT_Byte flag = point . on_curve ? GLYF_ON_CURVE : 0 ; <nl> + FT_Int dx = point . x - last_x ; <nl> + FT_Int dy = point . y - last_y ; <nl> <nl> <nl> if ( dx = = 0 ) <nl> <nl> if ( dx = = 0 ) <nl> ; <nl> else if ( dx > - 256 & & dx < 256 ) <nl> - dst [ x_offset + + ] = FT_ABS ( dx ) ; <nl> + dst [ x_offset + + ] = ( FT_Byte ) FT_ABS ( dx ) ; <nl> else <nl> { <nl> pointer = dst + x_offset ; <nl> <nl> if ( dy = = 0 ) <nl> ; <nl> else if ( dy > - 256 & & dy < 256 ) <nl> - dst [ y_offset + + ] = FT_ABS ( dy ) ; <nl> + dst [ y_offset + + ] = ( FT_Byte ) FT_ABS ( dy ) ; <nl> else <nl> { <nl> pointer = dst + y_offset ; <nl> <nl> bbox_bitmap_offset = substreams [ BBOX_STREAM ] . offset ; <nl> <nl> / * Size of bboxBitmap = 4 * floor ( ( numGlyphs + 31 ) / 32 ) * / <nl> - bitmap_length = ( ( num_glyphs + 31 ) > > 5 ) < < 2 ; <nl> + bitmap_length = ( ( num_glyphs + 31U ) > > 5 ) < < 2 ; <nl> substreams [ BBOX_STREAM ] . offset + = bitmap_length ; <nl> <nl> glyph_buf_size = WOFF2_DEFAULT_GLYPH_BUF ; <nl> <nl> <nl> / * Store x_mins , may be required to reconstruct ` hmtx ' . * / <nl> if ( n_contours > 0 ) <nl> - info - > x_mins [ i ] = x_min ; <nl> + info - > x_mins [ i ] = ( FT_Short ) x_min ; <nl> } <nl> <nl> info - > glyf_table - > dst_length = dest_offset - info - > glyf_table - > dst_offset ; <nl> <nl> FT_TRACE4 ( ( " loca table info : \ n " ) ) ; <nl> FT_TRACE4 ( ( " dst_offset = % lu \ n " , info - > loca_table - > dst_offset ) ) ; <nl> FT_TRACE4 ( ( " dst_length = % lu \ n " , info - > loca_table - > dst_length ) ) ; <nl> - FT_TRACE4 ( ( " checksum = % 09x \ n " , * loca_checksum ) ) ; <nl> + FT_TRACE4 ( ( " checksum = % 09lx \ n " , * loca_checksum ) ) ; <nl> <nl> / * Set pointer ` sfnt_bytes ' to its correct value . * / <nl> * sfnt_bytes = sfnt ; <nl> <nl> return FT_THROW ( Invalid_Table ) ; <nl> } <nl> <nl> + if ( ! info - > loca_table ) <nl> + { <nl> + FT_ERROR ( ( " ` loca ' table is missing . \ n " ) ) ; <nl> + return FT_THROW ( Invalid_Table ) ; <nl> + } <nl> + <nl> / * Read ` numGlyphs ' field from ` maxp ' table . * / <nl> if ( FT_STREAM_SEEK ( maxp_table - > src_offset ) | | FT_STREAM_SKIP ( 8 ) ) <nl> return error ; <nl> <nl> if ( FT_STREAM_SEEK ( glyf_offset ) | | FT_STREAM_SKIP ( 2 ) ) <nl> return error ; <nl> <nl> - if ( FT_READ_USHORT ( info - > x_mins [ i ] ) ) <nl> + if ( FT_READ_SHORT ( info - > x_mins [ i ] ) ) <nl> return error ; <nl> } <nl> <nl> <nl> WOFF2_TableRec table = * ( indices [ nn ] ) ; <nl> <nl> <nl> - FT_TRACE3 ( ( " Seeking to % d with table size % d . \ n " , <nl> + FT_TRACE3 ( ( " Seeking to % ld with table size % ld . \ n " , <nl> table . src_offset , table . src_length ) ) ; <nl> FT_TRACE3 ( ( " Table tag : % c % c % c % c . \ n " , <nl> ( FT_Char ) ( table . Tag > > 24 ) , <nl> <nl> <nl> checksum = compute_ULong_sum ( transformed_buf + table . src_offset , <nl> table . src_length ) ; <nl> - FT_TRACE4 ( ( " Checksum = % 09x . \ n " , checksum ) ) ; <nl> + FT_TRACE4 ( ( " Checksum = % 09lx . \ n " , checksum ) ) ; <nl> <nl> if ( WRITE_SFNT_BUF ( transformed_buf + table . src_offset , <nl> table . src_length ) ) <nl> <nl> memory ) ) <nl> goto Fail ; <nl> <nl> - FT_TRACE4 ( ( " Checksum = % 09x . \ n " , checksum ) ) ; <nl> + FT_TRACE4 ( ( " Checksum = % 09lx . \ n " , checksum ) ) ; <nl> } <nl> <nl> else if ( table . Tag = = TTAG_loca ) <nl> <nl> <nl> WRITE_ULONG ( buf_cursor , font_checksum ) ; <nl> <nl> - FT_TRACE2 ( ( " Final checksum = % 09x . \ n " , font_checksum ) ) ; <nl> + FT_TRACE2 ( ( " Final checksum = % 09lx . \ n " , font_checksum ) ) ; <nl> <nl> woff2 - > actual_sfnt_size = dest_offset ; <nl> <nl> <nl> if ( FT_STREAM_READ_FIELDS ( woff2_header_fields , & woff2 ) ) <nl> return error ; <nl> <nl> - FT_TRACE4 ( ( " signature - > 0x % X \ n " , woff2 . signature ) ) ; <nl> + FT_TRACE4 ( ( " signature - > 0x % lX \ n " , woff2 . signature ) ) ; <nl> FT_TRACE2 ( ( " flavor - > 0x % 08lx \ n " , woff2 . flavor ) ) ; <nl> FT_TRACE4 ( ( " length - > % lu \ n " , woff2 . length ) ) ; <nl> FT_TRACE2 ( ( " num_tables - > % hu \ n " , woff2 . num_tables ) ) ; <nl> FT_TRACE4 ( ( " totalSfntSize - > % lu \ n " , woff2 . totalSfntSize ) ) ; <nl> - FT_TRACE4 ( ( " metaOffset - > % hu \ n " , woff2 . metaOffset ) ) ; <nl> - FT_TRACE4 ( ( " metaLength - > % hu \ n " , woff2 . metaLength ) ) ; <nl> - FT_TRACE4 ( ( " privOffset - > % hu \ n " , woff2 . privOffset ) ) ; <nl> - FT_TRACE4 ( ( " privLength - > % hu \ n " , woff2 . privLength ) ) ; <nl> + FT_TRACE4 ( ( " metaOffset - > % lu \ n " , woff2 . metaOffset ) ) ; <nl> + FT_TRACE4 ( ( " metaLength - > % lu \ n " , woff2 . metaLength ) ) ; <nl> + FT_TRACE4 ( ( " privOffset - > % lu \ n " , woff2 . privOffset ) ) ; <nl> + FT_TRACE4 ( ( " privLength - > % lu \ n " , woff2 . privLength ) ) ; <nl> <nl> / * Make sure we don ' t recurse back here . * / <nl> if ( woff2 . flavor = = TTAG_wOF2 ) <nl> <nl> FT_NEW_ARRAY ( indices , woff2 . num_tables ) ) <nl> goto Exit ; <nl> <nl> - FT_TRACE2 ( ( " \ n " <nl> - " tag flags transform origLen transformLen \ n " <nl> - " mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - \ n " ) ) ; <nl> + FT_TRACE2 ( ( <nl> + " \ n " <nl> + " tag flags transform origLen transformLen offset \ n " <nl> + " mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - \ n " ) ) ; <nl> + / * " XXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX " * / <nl> <nl> for ( nn = 0 ; nn < woff2 . num_tables ; nn + + ) <nl> { <nl> <nl> src_offset + = table - > TransformLength ; <nl> table - > flags = flags ; <nl> <nl> - FT_TRACE2 ( ( " % c % c % c % c % 08d % 08d % 08ld % 08ld \ n " , <nl> + FT_TRACE2 ( ( " % c % c % c % c % 08d % 08d % 08ld % 08ld % 08ld \ n " , <nl> ( FT_Char ) ( table - > Tag > > 24 ) , <nl> ( FT_Char ) ( table - > Tag > > 16 ) , <nl> ( FT_Char ) ( table - > Tag > > 8 ) , <nl> <nl> ( table - > FlagByte > > 6 ) & 0x03 , <nl> table - > dst_length , <nl> table - > TransformLength , <nl> - table - > src_length , <nl> table - > src_offset ) ) ; <nl> <nl> indices [ nn ] = table ; <nl> <nl> goto Exit ; <nl> } <nl> <nl> - FT_TRACE4 ( ( " Number of fonts in TTC : % ld \ n " , woff2 . num_fonts ) ) ; <nl> + FT_TRACE4 ( ( " Number of fonts in TTC : % d \ n " , woff2 . num_fonts ) ) ; <nl> <nl> if ( FT_NEW_ARRAY ( woff2 . ttc_fonts , woff2 . num_fonts ) ) <nl> goto Exit ; <nl> <nl> if ( FT_NEW_ARRAY ( ttc_font - > table_indices , ttc_font - > num_tables ) ) <nl> goto Exit ; <nl> <nl> - FT_TRACE5 ( ( " Number of tables in font % d : % ld \ n " , <nl> + FT_TRACE5 ( ( " Number of tables in font % d : % d \ n " , <nl> nn , ttc_font - > num_tables ) ) ; <nl> <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> mmm a / thirdparty / freetype / src / sfnt / sfwoff2 . h <nl> ppp b / thirdparty / freetype / src / sfnt / sfwoff2 . h <nl> <nl> # define SFWOFF2_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / ttbdf . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttbdf . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> # include " ttbdf . h " <nl> <nl> # include " sferrors . h " <nl> mmm a / thirdparty / freetype / src / sfnt / ttbdf . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttbdf . h <nl> <nl> # define TTBDF_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttload . h " <nl> - # include FT_BDF_H <nl> + # include < freetype / ftbdf . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / ttcmap . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttcmap . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include " sferrors . h " / * must come before FT_INTERNAL_VALIDATE_H * / <nl> + # include " sferrors . h " / * must come before ` ftvalid . h ' * / <nl> <nl> - # include FT_INTERNAL_VALIDATE_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> + # include < freetype / internal / ftvalid . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> # include " ttload . h " <nl> # include " ttcmap . h " <nl> # include " ttpost . h " <nl> <nl> <nl> static const TT_CMap_Class tt_cmap_classes [ ] = <nl> { <nl> + # undef TTCMAPCITEM <nl> # define TTCMAPCITEM ( a ) & a , <nl> # include " ttcmapc . h " <nl> NULL , <nl> <nl> p + = 2 ; <nl> <nl> num_cmaps = TT_NEXT_USHORT ( p ) ; <nl> - limit = table + face - > cmap_size ; <nl> + FT_TRACE4 ( ( " tt_face_build_cmaps : % d cmaps \ n " , num_cmaps ) ) ; <nl> <nl> + limit = table + face - > cmap_size ; <nl> for ( ; num_cmaps > 0 & & p + 8 < = limit ; num_cmaps - - ) <nl> { <nl> FT_CharMapRec charmap ; <nl> mmm a / thirdparty / freetype / src / sfnt / ttcmap . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttcmap . h <nl> <nl> # define TTCMAP_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> - # include FT_INTERNAL_VALIDATE_H <nl> - # include FT_SERVICE_TT_CMAP_H <nl> + # include < freetype / internal / tttypes . h > <nl> + # include < freetype / internal / ftvalid . h > <nl> + # include < freetype / internal / services / svttcmap . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> FT_BEGIN_HEADER <nl> } ; <nl> <nl> <nl> + # undef TTCMAPCITEM <nl> + # define TTCMAPCITEM ( a ) FT_CALLBACK_TABLE const TT_CMap_ClassRec a ; <nl> + # include " ttcmapc . h " <nl> + <nl> + <nl> typedef struct TT_ValidatorRec_ <nl> { <nl> FT_ValidatorRec validator ; <nl> mmm a / thirdparty / freetype / src / sfnt / ttcolr . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttcolr . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_COLOR_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftcolor . h > <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_COLOR_LAYERS <nl> <nl> <nl> <nl> / * NOTE : These are the table sizes calculated through the specs . * / <nl> - # define BASE_GLYPH_SIZE 6 <nl> - # define LAYER_SIZE 4 <nl> - # define COLR_HEADER_SIZE 14 <nl> + # define BASE_GLYPH_SIZE 6U <nl> + # define LAYER_SIZE 4U <nl> + # define COLR_HEADER_SIZE 14U <nl> <nl> <nl> typedef struct BaseGlyphRecord_ <nl> mmm a / thirdparty / freetype / src / sfnt / ttcolr . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttcolr . h <nl> <nl> # define __TTCOLR_H__ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttload . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / ttcpal . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttcpal . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_COLOR_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftcolor . h > <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_COLOR_LAYERS <nl> <nl> <nl> <nl> / * NOTE : These are the table sizes calculated through the specs . * / <nl> - # define CPAL_V0_HEADER_BASE_SIZE 12 <nl> - # define COLOR_SIZE 4 <nl> + # define CPAL_V0_HEADER_BASE_SIZE 12U <nl> + # define COLOR_SIZE 4U <nl> <nl> <nl> / * all data from ` CPAL ' not covered in FT_Palette_Data * / <nl> <nl> 3U * 4 > table_size ) <nl> goto InvalidTable ; <nl> <nl> - p + = face - > palette_data . num_palettes * 2 ; <nl> + p + = face - > palette_data . num_palettes * 2U ; <nl> <nl> type_offset = FT_NEXT_ULONG ( p ) ; <nl> label_offset = FT_NEXT_ULONG ( p ) ; <nl> <nl> { <nl> if ( type_offset > = table_size ) <nl> goto InvalidTable ; <nl> - if ( face - > palette_data . num_palettes * 2 > <nl> + if ( face - > palette_data . num_palettes * 2U > <nl> table_size - type_offset ) <nl> goto InvalidTable ; <nl> <nl> <nl> { <nl> if ( label_offset > = table_size ) <nl> goto InvalidTable ; <nl> - if ( face - > palette_data . num_palettes * 2 > <nl> + if ( face - > palette_data . num_palettes * 2U > <nl> table_size - label_offset ) <nl> goto InvalidTable ; <nl> <nl> <nl> { <nl> if ( entry_label_offset > = table_size ) <nl> goto InvalidTable ; <nl> - if ( face - > palette_data . num_palette_entries * 2 > <nl> + if ( face - > palette_data . num_palette_entries * 2U > <nl> table_size - entry_label_offset ) <nl> goto InvalidTable ; <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / ttcpal . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttcpal . h <nl> <nl> # define __TTCPAL_H__ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttload . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / ttkern . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttkern . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> # include " ttkern . h " <nl> <nl> # include " sferrors . h " <nl> mmm a / thirdparty / freetype / src / sfnt / ttkern . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttkern . h <nl> <nl> # define TTKERN_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / ttload . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttload . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> # include " ttload . h " <nl> <nl> # include " sferrors . h " <nl> <nl> # endif <nl> <nl> <nl> - FT_TRACE4 ( ( " tt_face_lookup_table : % 08p , ` % c % c % c % c ' - - " , <nl> - face , <nl> + FT_TRACE4 ( ( " tt_face_lookup_table : % p , ` % c % c % c % c ' - - " , <nl> + ( void * ) face , <nl> ( FT_Char ) ( tag > > 24 ) , <nl> ( FT_Char ) ( tag > > 16 ) , <nl> ( FT_Char ) ( tag > > 8 ) , <nl> <nl> } ; <nl> <nl> <nl> - FT_TRACE2 ( ( " tt_face_load_font_dir : % 08p \ n " , face ) ) ; <nl> + FT_TRACE2 ( ( " tt_face_load_font_dir : % p \ n " , ( void * ) face ) ) ; <nl> <nl> / * read the offset table * / <nl> <nl> <nl> / * we don ' t load the glyph names , we do that in another * / <nl> / * module ( ttpost ) . * / <nl> <nl> - FT_TRACE3 ( ( " FormatType : 0x % x \ n " , post - > FormatType ) ) ; <nl> + FT_TRACE3 ( ( " FormatType : 0x % lx \ n " , post - > FormatType ) ) ; <nl> FT_TRACE3 ( ( " isFixedPitch : % s \ n " , post - > isFixedPitch <nl> ? " yes " : " no " ) ) ; <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / ttload . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttload . h <nl> <nl> # define TTLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / ttmtx . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttmtx . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_SERVICE_METRICS_VARIATIONS_H <nl> + # include < freetype / internal / services / svmetric . h > <nl> # endif <nl> <nl> # include " ttmtx . h " <nl> mmm a / thirdparty / freetype / src / sfnt / ttmtx . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttmtx . h <nl> <nl> # define TTMTX_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / ttpost . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttpost . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES <nl> <nl> # ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES <nl> <nl> <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> + # include < freetype / internal / services / svpscmap . h > <nl> <nl> # define MAC_NAME ( x ) ( FT_String * ) psnames - > macintosh_name ( ( FT_UInt ) ( x ) ) <nl> <nl> <nl> break ; <nl> else <nl> { <nl> - FT_TRACE6 ( ( " load_format_20 : % d byte left in post table \ n " , <nl> + FT_TRACE6 ( ( " load_format_20 : % ld byte left in post table \ n " , <nl> post_limit - FT_STREAM_POS ( ) ) ) ; <nl> <nl> if ( FT_READ_BYTE ( len ) ) <nl> mmm a / thirdparty / freetype / src / sfnt / ttpost . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttpost . h <nl> <nl> <nl> # include < ft2build . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / sfnt / ttsbit . c <nl> ppp b / thirdparty / freetype / src / sfnt / ttsbit . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_BITMAP_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftbitmap . h > <nl> <nl> <nl> # ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS <nl> <nl> FT_TRACE2 ( ( " tt_face_load_strike_metrics : " <nl> " sanitizing invalid ascender and descender \ n " <nl> " " <nl> - " values for strike % d ( % dppem , % dppem ) \ n " , <nl> + " values for strike % ld ( % dppem , % dppem ) \ n " , <nl> strike_index , <nl> metrics - > x_ppem , metrics - > y_ppem ) ) ; <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / ttsbit . h <nl> ppp b / thirdparty / freetype / src / sfnt / ttsbit . h <nl> <nl> # define TTSBIT_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttload . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / sfnt / woff2tags . c <nl> ppp b / thirdparty / freetype / src / sfnt / woff2tags . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_TRUETYPE_TAGS_H <nl> - <nl> + # include < freetype / tttags . h > <nl> + # include " woff2tags . h " <nl> <nl> / * <nl> * Return tag from index in the order given in WOFF2 specification . <nl> mmm a / thirdparty / freetype / src / sfnt / woff2tags . h <nl> ppp b / thirdparty / freetype / src / sfnt / woff2tags . h <nl> <nl> * <nl> * WOFFF2 Font table tags ( specification ) . <nl> * <nl> - * Copyright ( C ) 1996 - 2020 by <nl> + * Copyright ( C ) 2019 - 2020 by <nl> * Nikhil Ramakrishnan , David Turner , Robert Wilhelm , and Werner Lemberg . <nl> * <nl> * This file is part of the FreeType project , and may only be used , <nl> <nl> # define WOFF2TAGS_H <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / compiler - macros . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / smooth / ftgrays . c <nl> ppp b / thirdparty / freetype / src / smooth / ftgrays . c <nl> typedef ptrdiff_t FT_PtrDist ; <nl> # else / * ! STANDALONE_ * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ftgrays . h " <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_OUTLINE_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / ftoutln . h > <nl> <nl> # include " ftsmerrs . h " <nl> <nl> typedef ptrdiff_t FT_PtrDist ; <nl> if ( ! ras . invalid ) <nl> gray_record_cell ( RAS_VAR ) ; <nl> <nl> - FT_TRACE7 ( ( " band [ % d . . % d ] : % d cell % s \ n " , <nl> + FT_TRACE7 ( ( " band [ % d . . % d ] : % ld cell % s \ n " , <nl> ras . min_ey , <nl> ras . max_ey , <nl> ras . num_cells , <nl> mmm a / thirdparty / freetype / src / smooth / ftgrays . h <nl> ppp b / thirdparty / freetype / src / smooth / ftgrays . h <nl> <nl> # include " ftimage . h " <nl> # else <nl> # include < ft2build . h > <nl> - # include FT_IMAGE_H <nl> + # include < freetype / ftimage . h > <nl> # endif <nl> <nl> <nl> mmm a / thirdparty / freetype / src / smooth / ftsmerrs . h <nl> ppp b / thirdparty / freetype / src / smooth / ftsmerrs . h <nl> <nl> # ifndef FTSMERRS_H_ <nl> # define FTSMERRS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX Smooth_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Smooth <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * FTSMERRS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / smooth / ftsmooth . c <nl> ppp b / thirdparty / freetype / src / smooth / ftsmooth . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_OUTLINE_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ftoutln . h > <nl> # include " ftsmooth . h " <nl> # include " ftgrays . h " <nl> <nl> # include " ftsmerrs . h " <nl> <nl> <nl> - / * initialize renderer - - init its raster * / <nl> - static FT_Error <nl> - ft_smooth_init ( FT_Renderer render ) <nl> - { <nl> - <nl> - # ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING <nl> - <nl> - FT_Vector * sub = render - > root . library - > lcd_geometry ; <nl> - <nl> - <nl> - / * set up default subpixel geometry for striped RGB panels . * / <nl> - sub [ 0 ] . x = - 21 ; <nl> - sub [ 0 ] . y = 0 ; <nl> - sub [ 1 ] . x = 0 ; <nl> - sub [ 1 ] . y = 0 ; <nl> - sub [ 2 ] . x = 21 ; <nl> - sub [ 2 ] . y = 0 ; <nl> - <nl> - # elif 0 / * or else , once ClearType patents expire * / <nl> - <nl> - FT_Library_SetLcdFilter ( render - > root . library , FT_LCD_FILTER_DEFAULT ) ; <nl> - <nl> - # endif <nl> - <nl> - render - > clazz - > raster_class - > raster_reset ( render - > raster , NULL , 0 ) ; <nl> - <nl> - return 0 ; <nl> - } <nl> - <nl> - <nl> / * sets render - specific mode * / <nl> static FT_Error <nl> ft_smooth_set_mode ( FT_Renderer render , <nl> <nl> FT_Outline_Get_CBox ( & slot - > outline , cbox ) ; <nl> } <nl> <nl> + typedef struct TOrigin_ <nl> + { <nl> + unsigned char * origin ; / * pixmap origin at the bottom - left * / <nl> + int pitch ; / * pitch to go down one row * / <nl> + <nl> + } TOrigin ; <nl> <nl> - / * convert a slot ' s glyph image into a bitmap * / <nl> + # ifndef FT_CONFIG_OPTION_SUBPIXEL_RENDERING <nl> + <nl> + / * initialize renderer - - init its raster * / <nl> static FT_Error <nl> - ft_smooth_render_generic ( FT_Renderer render , <nl> - FT_GlyphSlot slot , <nl> - FT_Render_Mode mode , <nl> - const FT_Vector * origin , <nl> - FT_Render_Mode required_mode ) <nl> + ft_smooth_init ( FT_Renderer render ) <nl> + { <nl> + FT_Vector * sub = render - > root . library - > lcd_geometry ; <nl> + <nl> + <nl> + / * set up default subpixel geometry for striped RGB panels . * / <nl> + sub [ 0 ] . x = - 21 ; <nl> + sub [ 0 ] . y = 0 ; <nl> + sub [ 1 ] . x = 0 ; <nl> + sub [ 1 ] . y = 0 ; <nl> + sub [ 2 ] . x = 21 ; <nl> + sub [ 2 ] . y = 0 ; <nl> + <nl> + render - > clazz - > raster_class - > raster_reset ( render - > raster , NULL , 0 ) ; <nl> + <nl> + return 0 ; <nl> + } <nl> + <nl> + <nl> + / * This function writes every third byte in direct rendering mode * / <nl> + static void <nl> + ft_smooth_lcd_spans ( int y , <nl> + int count , <nl> + const FT_Span * spans , <nl> + TOrigin * target ) <nl> + { <nl> + unsigned char * dst_line = target - > origin - y * target - > pitch ; <nl> + unsigned char * dst ; <nl> + unsigned short w ; <nl> + <nl> + <nl> + for ( ; count - - ; spans + + ) <nl> + for ( dst = dst_line + spans - > x * 3 , w = spans - > len ; w - - ; dst + = 3 ) <nl> + * dst = spans - > coverage ; <nl> + } <nl> + <nl> + <nl> + static FT_Error <nl> + ft_smooth_raster_lcd ( FT_Renderer render , <nl> + FT_Outline * outline , <nl> + FT_Bitmap * bitmap ) <nl> + { <nl> + FT_Error error = FT_Err_Ok ; <nl> + FT_Vector * sub = render - > root . library - > lcd_geometry ; <nl> + FT_Pos x , y ; <nl> + <nl> + FT_Raster_Params params ; <nl> + TOrigin target ; <nl> + <nl> + <nl> + / * Render 3 separate coverage bitmaps , shifting the outline . * / <nl> + / * Set up direct rendering to record them on each third byte . * / <nl> + params . source = outline ; <nl> + params . flags = FT_RASTER_FLAG_AA | FT_RASTER_FLAG_DIRECT ; <nl> + params . gray_spans = ( FT_SpanFunc ) ft_smooth_lcd_spans ; <nl> + params . user = & target ; <nl> + <nl> + params . clip_box . xMin = 0 ; <nl> + params . clip_box . yMin = 0 ; <nl> + params . clip_box . xMax = bitmap - > width ; <nl> + params . clip_box . yMax = bitmap - > rows ; <nl> + <nl> + if ( bitmap - > pitch < 0 ) <nl> + target . origin = bitmap - > buffer ; <nl> + else <nl> + target . origin = bitmap - > buffer <nl> + + ( bitmap - > rows - 1 ) * ( unsigned int ) bitmap - > pitch ; <nl> + <nl> + target . pitch = bitmap - > pitch ; <nl> + <nl> + FT_Outline_Translate ( outline , <nl> + - sub [ 0 ] . x , <nl> + - sub [ 0 ] . y ) ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + x = sub [ 0 ] . x ; <nl> + y = sub [ 0 ] . y ; <nl> + if ( error ) <nl> + goto Exit ; <nl> + <nl> + target . origin + + ; <nl> + FT_Outline_Translate ( outline , <nl> + sub [ 0 ] . x - sub [ 1 ] . x , <nl> + sub [ 0 ] . y - sub [ 1 ] . y ) ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + x = sub [ 1 ] . x ; <nl> + y = sub [ 1 ] . y ; <nl> + if ( error ) <nl> + goto Exit ; <nl> + <nl> + target . origin + + ; <nl> + FT_Outline_Translate ( outline , <nl> + sub [ 1 ] . x - sub [ 2 ] . x , <nl> + sub [ 1 ] . y - sub [ 2 ] . y ) ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + x = sub [ 2 ] . x ; <nl> + y = sub [ 2 ] . y ; <nl> + <nl> + Exit : <nl> + FT_Outline_Translate ( outline , x , y ) ; <nl> + <nl> + return error ; <nl> + } <nl> + <nl> + <nl> + static FT_Error <nl> + ft_smooth_raster_lcdv ( FT_Renderer render , <nl> + FT_Outline * outline , <nl> + FT_Bitmap * bitmap ) <nl> + { <nl> + FT_Error error = FT_Err_Ok ; <nl> + int pitch = bitmap - > pitch ; <nl> + FT_Vector * sub = render - > root . library - > lcd_geometry ; <nl> + FT_Pos x , y ; <nl> + <nl> + FT_Raster_Params params ; <nl> + <nl> + <nl> + params . target = bitmap ; <nl> + params . source = outline ; <nl> + params . flags = FT_RASTER_FLAG_AA ; <nl> + <nl> + / * Render 3 separate coverage bitmaps , shifting the outline . * / <nl> + / * Notice that the subpixel geometry vectors are rotated . * / <nl> + / * Triple the pitch to render on each third row . * / <nl> + bitmap - > pitch * = 3 ; <nl> + bitmap - > rows / = 3 ; <nl> + <nl> + FT_Outline_Translate ( outline , <nl> + - sub [ 0 ] . y , <nl> + sub [ 0 ] . x ) ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + x = sub [ 0 ] . y ; <nl> + y = - sub [ 0 ] . x ; <nl> + if ( error ) <nl> + goto Exit ; <nl> + <nl> + bitmap - > buffer + = pitch ; <nl> + FT_Outline_Translate ( outline , <nl> + sub [ 0 ] . y - sub [ 1 ] . y , <nl> + sub [ 1 ] . x - sub [ 0 ] . x ) ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + x = sub [ 1 ] . y ; <nl> + y = - sub [ 1 ] . x ; <nl> + bitmap - > buffer - = pitch ; <nl> + if ( error ) <nl> + goto Exit ; <nl> + <nl> + bitmap - > buffer + = 2 * pitch ; <nl> + FT_Outline_Translate ( outline , <nl> + sub [ 1 ] . y - sub [ 2 ] . y , <nl> + sub [ 2 ] . x - sub [ 1 ] . x ) ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + x = sub [ 2 ] . y ; <nl> + y = - sub [ 2 ] . x ; <nl> + bitmap - > buffer - = 2 * pitch ; <nl> + <nl> + Exit : <nl> + FT_Outline_Translate ( outline , x , y ) ; <nl> + <nl> + bitmap - > pitch / = 3 ; <nl> + bitmap - > rows * = 3 ; <nl> + <nl> + return error ; <nl> + } <nl> + <nl> + # else / * FT_CONFIG_OPTION_SUBPIXEL_RENDERING * / <nl> + <nl> + / * initialize renderer - - init its raster * / <nl> + static FT_Error <nl> + ft_smooth_init ( FT_Renderer render ) <nl> + { <nl> + / * set up default LCD filtering * / <nl> + FT_Library_SetLcdFilter ( render - > root . library , FT_LCD_FILTER_DEFAULT ) ; <nl> + <nl> + render - > clazz - > raster_class - > raster_reset ( render - > raster , NULL , 0 ) ; <nl> + <nl> + return 0 ; <nl> + } <nl> + <nl> + <nl> + static FT_Error <nl> + ft_smooth_raster_lcd ( FT_Renderer render , <nl> + FT_Outline * outline , <nl> + FT_Bitmap * bitmap ) <nl> + { <nl> + FT_Error error = FT_Err_Ok ; <nl> + FT_Vector * points = outline - > points ; <nl> + FT_Vector * points_end = FT_OFFSET ( points , outline - > n_points ) ; <nl> + FT_Vector * vec ; <nl> + <nl> + FT_Raster_Params params ; <nl> + <nl> + <nl> + params . target = bitmap ; <nl> + params . source = outline ; <nl> + params . flags = FT_RASTER_FLAG_AA ; <nl> + <nl> + / * implode outline * / <nl> + for ( vec = points ; vec < points_end ; vec + + ) <nl> + vec - > x * = 3 ; <nl> + <nl> + / * render outline into the bitmap * / <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + <nl> + / * deflate outline * / <nl> + for ( vec = points ; vec < points_end ; vec + + ) <nl> + vec - > x / = 3 ; <nl> + <nl> + return error ; <nl> + } <nl> + <nl> + <nl> + static FT_Error <nl> + ft_smooth_raster_lcdv ( FT_Renderer render , <nl> + FT_Outline * outline , <nl> + FT_Bitmap * bitmap ) <nl> + { <nl> + FT_Error error = FT_Err_Ok ; <nl> + FT_Vector * points = outline - > points ; <nl> + FT_Vector * points_end = FT_OFFSET ( points , outline - > n_points ) ; <nl> + FT_Vector * vec ; <nl> + <nl> + FT_Raster_Params params ; <nl> + <nl> + <nl> + params . target = bitmap ; <nl> + params . source = outline ; <nl> + params . flags = FT_RASTER_FLAG_AA ; <nl> + <nl> + / * implode outline * / <nl> + for ( vec = points ; vec < points_end ; vec + + ) <nl> + vec - > y * = 3 ; <nl> + <nl> + / * render outline into the bitmap * / <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + <nl> + / * deflate outline * / <nl> + for ( vec = points ; vec < points_end ; vec + + ) <nl> + vec - > y / = 3 ; <nl> + <nl> + return error ; <nl> + } <nl> + <nl> + # endif / * FT_CONFIG_OPTION_SUBPIXEL_RENDERING * / <nl> + <nl> + / * Oversampling scale to be used in rendering overlaps * / <nl> + # define SCALE ( 1 < < 2 ) <nl> + <nl> + / * This function averages inflated spans in direct rendering mode * / <nl> + static void <nl> + ft_smooth_overlap_spans ( int y , <nl> + int count , <nl> + const FT_Span * spans , <nl> + TOrigin * target ) <nl> + { <nl> + unsigned char * dst = target - > origin - ( y / SCALE ) * target - > pitch ; <nl> + unsigned short x ; <nl> + unsigned int cover , sum ; <nl> + <nl> + <nl> + / * When accumulating the oversampled spans we need to assure that * / <nl> + / * fully covered pixels are equal to 255 and do not overflow . * / <nl> + / * It is important that the SCALE is a power of 2 , each subpixel * / <nl> + / * cover can also reach a power of 2 after rounding , and the total * / <nl> + / * is clamped to 255 when it adds up to 256 . * / <nl> + for ( ; count - - ; spans + + ) <nl> + { <nl> + cover = ( spans - > coverage + SCALE * SCALE / 2 ) / ( SCALE * SCALE ) ; <nl> + for ( x = 0 ; x < spans - > len ; x + + ) <nl> + { <nl> + sum = dst [ ( spans - > x + x ) / SCALE ] + cover ; <nl> + dst [ ( spans - > x + x ) / SCALE ] = ( unsigned char ) ( sum - ( sum > > 8 ) ) ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + <nl> + static FT_Error <nl> + ft_smooth_raster_overlap ( FT_Renderer render , <nl> + FT_Outline * outline , <nl> + FT_Bitmap * bitmap ) <nl> + { <nl> + FT_Error error = FT_Err_Ok ; <nl> + FT_Vector * points = outline - > points ; <nl> + FT_Vector * points_end = FT_OFFSET ( points , outline - > n_points ) ; <nl> + FT_Vector * vec ; <nl> + <nl> + FT_Raster_Params params ; <nl> + TOrigin target ; <nl> + <nl> + <nl> + / * Reject outlines that are too wide for 16 - bit FT_Span . * / <nl> + / * Other limits are applied upstream with the same error code . * / <nl> + if ( bitmap - > width * SCALE > 0x7FFF ) <nl> + return FT_THROW ( Raster_Overflow ) ; <nl> + <nl> + / * Set up direct rendering to average oversampled spans . * / <nl> + params . source = outline ; <nl> + params . flags = FT_RASTER_FLAG_AA | FT_RASTER_FLAG_DIRECT ; <nl> + params . gray_spans = ( FT_SpanFunc ) ft_smooth_overlap_spans ; <nl> + params . user = & target ; <nl> + <nl> + params . clip_box . xMin = 0 ; <nl> + params . clip_box . yMin = 0 ; <nl> + params . clip_box . xMax = bitmap - > width * SCALE ; <nl> + params . clip_box . yMax = bitmap - > rows * SCALE ; <nl> + <nl> + if ( bitmap - > pitch < 0 ) <nl> + target . origin = bitmap - > buffer ; <nl> + else <nl> + target . origin = bitmap - > buffer <nl> + + ( bitmap - > rows - 1 ) * ( unsigned int ) bitmap - > pitch ; <nl> + <nl> + target . pitch = bitmap - > pitch ; <nl> + <nl> + / * inflate outline * / <nl> + for ( vec = points ; vec < points_end ; vec + + ) <nl> + { <nl> + vec - > x * = SCALE ; <nl> + vec - > y * = SCALE ; <nl> + } <nl> + <nl> + / * render outline into the bitmap * / <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + <nl> + / * deflate outline * / <nl> + for ( vec = points ; vec < points_end ; vec + + ) <nl> + { <nl> + vec - > x / = SCALE ; <nl> + vec - > y / = SCALE ; <nl> + } <nl> + <nl> + return error ; <nl> + } <nl> + <nl> + # undef SCALE <nl> + <nl> + static FT_Error <nl> + ft_smooth_render ( FT_Renderer render , <nl> + FT_GlyphSlot slot , <nl> + FT_Render_Mode mode , <nl> + const FT_Vector * origin ) <nl> { <nl> FT_Error error = FT_Err_Ok ; <nl> FT_Outline * outline = & slot - > outline ; <nl> <nl> FT_Memory memory = render - > root . memory ; <nl> FT_Pos x_shift = 0 ; <nl> FT_Pos y_shift = 0 ; <nl> - FT_Int hmul = ( mode = = FT_RENDER_MODE_LCD ) ; <nl> - FT_Int vmul = ( mode = = FT_RENDER_MODE_LCD_V ) ; <nl> - <nl> - FT_Raster_Params params ; <nl> <nl> <nl> / * check glyph image format * / <nl> <nl> } <nl> <nl> / * check mode * / <nl> - if ( mode ! = required_mode ) <nl> + if ( mode ! = FT_RENDER_MODE_NORMAL & & <nl> + mode ! = FT_RENDER_MODE_LIGHT & & <nl> + mode ! = FT_RENDER_MODE_LCD & & <nl> + mode ! = FT_RENDER_MODE_LCD_V ) <nl> { <nl> error = FT_THROW ( Cannot_Render_Glyph ) ; <nl> goto Exit ; <nl> <nl> if ( x_shift | | y_shift ) <nl> FT_Outline_Translate ( outline , x_shift , y_shift ) ; <nl> <nl> - / * set up parameters * / <nl> - params . target = bitmap ; <nl> - params . source = outline ; <nl> - params . flags = FT_RASTER_FLAG_AA ; <nl> - <nl> - # ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING <nl> - <nl> - / * implode outline if needed * / <nl> + if ( mode = = FT_RENDER_MODE_NORMAL | | <nl> + mode = = FT_RENDER_MODE_LIGHT ) <nl> { <nl> - FT_Vector * points = outline - > points ; <nl> - FT_Vector * points_end = FT_OFFSET ( points , outline - > n_points ) ; <nl> - FT_Vector * vec ; <nl> - <nl> - <nl> - if ( hmul ) <nl> - for ( vec = points ; vec < points_end ; vec + + ) <nl> - vec - > x * = 3 ; <nl> - <nl> - if ( vmul ) <nl> - for ( vec = points ; vec < points_end ; vec + + ) <nl> - vec - > y * = 3 ; <nl> - } <nl> - <nl> - / * render outline into the bitmap * / <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - <nl> - / * deflate outline if needed * / <nl> - { <nl> - FT_Vector * points = outline - > points ; <nl> - FT_Vector * points_end = FT_OFFSET ( points , outline - > n_points ) ; <nl> - FT_Vector * vec ; <nl> + if ( outline - > flags & FT_OUTLINE_OVERLAP ) <nl> + error = ft_smooth_raster_overlap ( render , outline , bitmap ) ; <nl> + else <nl> + { <nl> + FT_Raster_Params params ; <nl> <nl> <nl> - if ( hmul ) <nl> - for ( vec = points ; vec < points_end ; vec + + ) <nl> - vec - > x / = 3 ; <nl> + params . target = bitmap ; <nl> + params . source = outline ; <nl> + params . flags = FT_RASTER_FLAG_AA ; <nl> <nl> - if ( vmul ) <nl> - for ( vec = points ; vec < points_end ; vec + + ) <nl> - vec - > y / = 3 ; <nl> + error = render - > raster_render ( render - > raster , & params ) ; <nl> + } <nl> } <nl> - <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - / * finally apply filtering * / <nl> - if ( hmul | | vmul ) <nl> + else <nl> { <nl> - FT_Byte * lcd_weights ; <nl> - FT_Bitmap_LcdFilterFunc lcd_filter_func ; <nl> + if ( mode = = FT_RENDER_MODE_LCD ) <nl> + error = ft_smooth_raster_lcd ( render , outline , bitmap ) ; <nl> + else if ( mode = = FT_RENDER_MODE_LCD_V ) <nl> + error = ft_smooth_raster_lcdv ( render , outline , bitmap ) ; <nl> <nl> + # ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING <nl> <nl> - / * Per - face LCD filtering takes priority if set up . * / <nl> - if ( slot - > face & & slot - > face - > internal - > lcd_filter_func ) <nl> + / * finally apply filtering * / <nl> { <nl> - lcd_weights = slot - > face - > internal - > lcd_weights ; <nl> - lcd_filter_func = slot - > face - > internal - > lcd_filter_func ; <nl> - } <nl> - else <nl> - { <nl> - lcd_weights = slot - > library - > lcd_weights ; <nl> - lcd_filter_func = slot - > library - > lcd_filter_func ; <nl> - } <nl> + FT_Byte * lcd_weights ; <nl> + FT_Bitmap_LcdFilterFunc lcd_filter_func ; <nl> <nl> - if ( lcd_filter_func ) <nl> - lcd_filter_func ( bitmap , lcd_weights ) ; <nl> - } <nl> - <nl> - # else / * ! FT_CONFIG_OPTION_SUBPIXEL_RENDERING * / <nl> <nl> - if ( hmul ) / * lcd * / <nl> - { <nl> - FT_Byte * line ; <nl> - FT_Byte * temp = NULL ; <nl> - FT_UInt i , j ; <nl> - <nl> - unsigned int height = bitmap - > rows ; <nl> - unsigned int width = bitmap - > width ; <nl> - int pitch = bitmap - > pitch ; <nl> - <nl> - FT_Vector * sub = slot - > library - > lcd_geometry ; <nl> - <nl> - <nl> - / * Render 3 separate monochrome bitmaps , shifting the outline . * / <nl> - width / = 3 ; <nl> - <nl> - FT_Outline_Translate ( outline , <nl> - - sub [ 0 ] . x , <nl> - - sub [ 0 ] . y ) ; <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - bitmap - > buffer + = width ; <nl> - FT_Outline_Translate ( outline , <nl> - sub [ 0 ] . x - sub [ 1 ] . x , <nl> - sub [ 0 ] . y - sub [ 1 ] . y ) ; <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - bitmap - > buffer - = width ; <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - bitmap - > buffer + = 2 * width ; <nl> - FT_Outline_Translate ( outline , <nl> - sub [ 1 ] . x - sub [ 2 ] . x , <nl> - sub [ 1 ] . y - sub [ 2 ] . y ) ; <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - bitmap - > buffer - = 2 * width ; <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - x_shift - = sub [ 2 ] . x ; <nl> - y_shift - = sub [ 2 ] . y ; <nl> - <nl> - / * XXX : Rearrange the bytes according to FT_PIXEL_MODE_LCD . * / <nl> - / * XXX : It is more efficient to render every third byte above . * / <nl> - <nl> - if ( FT_ALLOC ( temp , ( FT_ULong ) pitch ) ) <nl> - goto Exit ; <nl> - <nl> - for ( i = 0 ; i < height ; i + + ) <nl> - { <nl> - line = bitmap - > buffer + i * ( FT_ULong ) pitch ; <nl> - for ( j = 0 ; j < width ; j + + ) <nl> + / * Per - face LCD filtering takes priority if set up . * / <nl> + if ( slot - > face & & slot - > face - > internal - > lcd_filter_func ) <nl> { <nl> - temp [ 3 * j ] = line [ j ] ; <nl> - temp [ 3 * j + 1 ] = line [ j + width ] ; <nl> - temp [ 3 * j + 2 ] = line [ j + width + width ] ; <nl> + lcd_weights = slot - > face - > internal - > lcd_weights ; <nl> + lcd_filter_func = slot - > face - > internal - > lcd_filter_func ; <nl> } <nl> - FT_MEM_COPY ( line , temp , pitch ) ; <nl> + else <nl> + { <nl> + lcd_weights = slot - > library - > lcd_weights ; <nl> + lcd_filter_func = slot - > library - > lcd_filter_func ; <nl> + } <nl> + <nl> + if ( lcd_filter_func ) <nl> + lcd_filter_func ( bitmap , lcd_weights ) ; <nl> } <nl> <nl> - FT_FREE ( temp ) ; <nl> - } <nl> - else if ( vmul ) / * lcd_v * / <nl> - { <nl> - int pitch = bitmap - > pitch ; <nl> - <nl> - FT_Vector * sub = slot - > library - > lcd_geometry ; <nl> - <nl> - <nl> - / * Render 3 separate monochrome bitmaps , shifting the outline . * / <nl> - / * Notice that the subpixel geometry vectors are rotated . * / <nl> - / * Triple the pitch to render on each third row . * / <nl> - bitmap - > pitch * = 3 ; <nl> - bitmap - > rows / = 3 ; <nl> - <nl> - FT_Outline_Translate ( outline , <nl> - - sub [ 0 ] . y , <nl> - sub [ 0 ] . x ) ; <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - bitmap - > buffer + = pitch ; <nl> - FT_Outline_Translate ( outline , <nl> - sub [ 0 ] . y - sub [ 1 ] . y , <nl> - sub [ 1 ] . x - sub [ 0 ] . x ) ; <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - bitmap - > buffer - = pitch ; <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - bitmap - > buffer + = 2 * pitch ; <nl> - FT_Outline_Translate ( outline , <nl> - sub [ 1 ] . y - sub [ 2 ] . y , <nl> - sub [ 2 ] . x - sub [ 1 ] . x ) ; <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> - bitmap - > buffer - = 2 * pitch ; <nl> - if ( error ) <nl> - goto Exit ; <nl> - <nl> - x_shift - = sub [ 2 ] . y ; <nl> - y_shift + = sub [ 2 ] . x ; <nl> - <nl> - bitmap - > pitch / = 3 ; <nl> - bitmap - > rows * = 3 ; <nl> - } <nl> - else / * grayscale * / <nl> - error = render - > raster_render ( render - > raster , & params ) ; <nl> + # endif / * FT_CONFIG_OPTION_SUBPIXEL_RENDERING * / <nl> <nl> - # endif / * ! FT_CONFIG_OPTION_SUBPIXEL_RENDERING * / <nl> + } <nl> <nl> Exit : <nl> if ( ! error ) <nl> <nl> } <nl> <nl> <nl> - / * convert a slot ' s glyph image into a bitmap * / <nl> - static FT_Error <nl> - ft_smooth_render ( FT_Renderer render , <nl> - FT_GlyphSlot slot , <nl> - FT_Render_Mode mode , <nl> - const FT_Vector * origin ) <nl> - { <nl> - if ( mode = = FT_RENDER_MODE_LIGHT ) <nl> - mode = FT_RENDER_MODE_NORMAL ; <nl> - <nl> - return ft_smooth_render_generic ( render , slot , mode , origin , <nl> - FT_RENDER_MODE_NORMAL ) ; <nl> - } <nl> - <nl> - <nl> - / * convert a slot ' s glyph image into a horizontal LCD bitmap * / <nl> - static FT_Error <nl> - ft_smooth_render_lcd ( FT_Renderer render , <nl> - FT_GlyphSlot slot , <nl> - FT_Render_Mode mode , <nl> - const FT_Vector * origin ) <nl> - { <nl> - return ft_smooth_render_generic ( render , slot , mode , origin , <nl> - FT_RENDER_MODE_LCD ) ; <nl> - } <nl> - <nl> - <nl> - / * convert a slot ' s glyph image into a vertical LCD bitmap * / <nl> - static FT_Error <nl> - ft_smooth_render_lcd_v ( FT_Renderer render , <nl> - FT_GlyphSlot slot , <nl> - FT_Render_Mode mode , <nl> - const FT_Vector * origin ) <nl> - { <nl> - return ft_smooth_render_generic ( render , slot , mode , origin , <nl> - FT_RENDER_MODE_LCD_V ) ; <nl> - } <nl> - <nl> - <nl> FT_DEFINE_RENDERER ( <nl> ft_smooth_renderer_class , <nl> <nl> <nl> ) <nl> <nl> <nl> - FT_DEFINE_RENDERER ( <nl> - ft_smooth_lcd_renderer_class , <nl> - <nl> - FT_MODULE_RENDERER , <nl> - sizeof ( FT_RendererRec ) , <nl> - <nl> - " smooth - lcd " , <nl> - 0x10000L , <nl> - 0x20000L , <nl> - <nl> - NULL , / * module specific interface * / <nl> - <nl> - ( FT_Module_Constructor ) ft_smooth_init , / * module_init * / <nl> - ( FT_Module_Destructor ) NULL , / * module_done * / <nl> - ( FT_Module_Requester ) NULL , / * get_interface * / <nl> - <nl> - FT_GLYPH_FORMAT_OUTLINE , <nl> - <nl> - ( FT_Renderer_RenderFunc ) ft_smooth_render_lcd , / * render_glyph * / <nl> - ( FT_Renderer_TransformFunc ) ft_smooth_transform , / * transform_glyph * / <nl> - ( FT_Renderer_GetCBoxFunc ) ft_smooth_get_cbox , / * get_glyph_cbox * / <nl> - ( FT_Renderer_SetModeFunc ) ft_smooth_set_mode , / * set_mode * / <nl> - <nl> - ( FT_Raster_Funcs * ) & ft_grays_raster / * raster_class * / <nl> - ) <nl> - <nl> - <nl> - FT_DEFINE_RENDERER ( <nl> - ft_smooth_lcdv_renderer_class , <nl> - <nl> - FT_MODULE_RENDERER , <nl> - sizeof ( FT_RendererRec ) , <nl> - <nl> - " smooth - lcdv " , <nl> - 0x10000L , <nl> - 0x20000L , <nl> - <nl> - NULL , / * module specific interface * / <nl> - <nl> - ( FT_Module_Constructor ) ft_smooth_init , / * module_init * / <nl> - ( FT_Module_Destructor ) NULL , / * module_done * / <nl> - ( FT_Module_Requester ) NULL , / * get_interface * / <nl> - <nl> - FT_GLYPH_FORMAT_OUTLINE , <nl> - <nl> - ( FT_Renderer_RenderFunc ) ft_smooth_render_lcd_v , / * render_glyph * / <nl> - ( FT_Renderer_TransformFunc ) ft_smooth_transform , / * transform_glyph * / <nl> - ( FT_Renderer_GetCBoxFunc ) ft_smooth_get_cbox , / * get_glyph_cbox * / <nl> - ( FT_Renderer_SetModeFunc ) ft_smooth_set_mode , / * set_mode * / <nl> - <nl> - ( FT_Raster_Funcs * ) & ft_grays_raster / * raster_class * / <nl> - ) <nl> - <nl> - <nl> / * END * / <nl> mmm a / thirdparty / freetype / src / smooth / ftsmooth . h <nl> ppp b / thirdparty / freetype / src / smooth / ftsmooth . h <nl> <nl> # define FTSMOOTH_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_RENDER_H <nl> + # include < freetype / ftrender . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> FT_BEGIN_HEADER <nl> <nl> FT_DECLARE_RENDERER ( ft_smooth_renderer_class ) <nl> <nl> - FT_DECLARE_RENDERER ( ft_smooth_lcd_renderer_class ) <nl> - <nl> - FT_DECLARE_RENDERER ( ft_smooth_lcdv_renderer_class ) <nl> - <nl> <nl> FT_END_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / smooth / module . mk <nl> ppp b / thirdparty / freetype / src / smooth / module . mk <nl> FTMODULE_H_COMMANDS + = SMOOTH_RENDERER <nl> define SMOOTH_RENDERER <nl> $ ( OPEN_DRIVER ) FT_Renderer_Class , ft_smooth_renderer_class $ ( CLOSE_DRIVER ) <nl> $ ( ECHO_DRIVER ) smooth $ ( ECHO_DRIVER_DESC ) anti - aliased bitmap renderer $ ( ECHO_DRIVER_DONE ) <nl> - $ ( OPEN_DRIVER ) FT_Renderer_Class , ft_smooth_lcd_renderer_class $ ( CLOSE_DRIVER ) <nl> - $ ( ECHO_DRIVER ) smooth $ ( ECHO_DRIVER_DESC ) anti - aliased bitmap renderer for LCDs $ ( ECHO_DRIVER_DONE ) <nl> - $ ( OPEN_DRIVER ) FT_Renderer_Class , ft_smooth_lcdv_renderer_class $ ( CLOSE_DRIVER ) <nl> - $ ( ECHO_DRIVER ) smooth $ ( ECHO_DRIVER_DESC ) anti - aliased bitmap renderer for vertical LCDs $ ( ECHO_DRIVER_DONE ) <nl> endef <nl> <nl> # EOF <nl> mmm a / thirdparty / freetype / src / smooth / smooth . c <nl> ppp b / thirdparty / freetype / src / smooth / smooth . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " ftgrays . c " <nl> # include " ftsmooth . c " <nl> mmm a / thirdparty / freetype / src / truetype / truetype . c <nl> ppp b / thirdparty / freetype / src / truetype / truetype . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " ttdriver . c " / * driver interface * / <nl> # include " ttgload . c " / * glyph loader * / <nl> mmm a / thirdparty / freetype / src / truetype / ttdriver . c <nl> ppp b / thirdparty / freetype / src / truetype / ttdriver . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> <nl> # ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_METRICS_VARIATIONS_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / services / svmm . h > <nl> + # include < freetype / internal / services / svmetric . h > <nl> # endif <nl> <nl> - # include FT_SERVICE_TRUETYPE_ENGINE_H <nl> - # include FT_SERVICE_TRUETYPE_GLYF_H <nl> - # include FT_SERVICE_PROPERTIES_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / services / svtteng . h > <nl> + # include < freetype / internal / services / svttglyf . h > <nl> + # include < freetype / internal / services / svprop . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " ttdriver . h " <nl> # include " ttgload . h " <nl> mmm a / thirdparty / freetype / src / truetype / ttdriver . h <nl> ppp b / thirdparty / freetype / src / truetype / ttdriver . h <nl> <nl> # define TTDRIVER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / truetype / tterrors . h <nl> ppp b / thirdparty / freetype / src / truetype / tterrors . h <nl> <nl> # ifndef TTERRORS_H_ <nl> # define TTERRORS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX TT_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_TrueType <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * TTERRORS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / truetype / ttgload . c <nl> ppp b / thirdparty / freetype / src / truetype / ttgload . c <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_DRIVER_H <nl> - # include FT_LIST_H <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftdriver . h > <nl> + # include < freetype / ftlist . h > <nl> <nl> # include " ttgload . h " <nl> # include " ttpload . h " <nl> <nl> # define SAME_X 0x10 <nl> # define Y_POSITIVE 0x20 / * two meanings depending on Y_SHORT_VECTOR * / <nl> # define SAME_Y 0x20 <nl> - # define OVERLAP_SIMPLE 0x40 / * we ignore this value * / <nl> + # define OVERLAP_SIMPLE 0x40 / * retained as FT_OUTLINE_OVERLAP * / <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> # define WE_HAVE_A_2X2 0x0080 <nl> # define WE_HAVE_INSTR 0x0100 <nl> # define USE_MY_METRICS 0x0200 <nl> - # define OVERLAP_COMPOUND 0x0400 / * we ignore this value * / <nl> + # define OVERLAP_COMPOUND 0x0400 / * retained as FT_OUTLINE_OVERLAP * / <nl> # define SCALED_COMPONENT_OFFSET 0x0800 <nl> # define UNSCALED_COMPONENT_OFFSET 0x1000 <nl> <nl> <nl> face - > horizontal . Descender ) ; <nl> } <nl> <nl> + # ifdef FT_DEBUG_LEVEL_TRACE <nl> + if ( ! face - > vertical_info ) <nl> + FT_TRACE5 ( ( " [ vertical metrics missing , computing values ] \ n " ) ) ; <nl> + # endif <nl> + <nl> FT_TRACE5 ( ( " advance height ( font units ) : % d \ n " , * ah ) ) ; <nl> FT_TRACE5 ( ( " top side bearing ( font units ) : % d \ n " , * tsb ) ) ; <nl> } <nl> <nl> loader - > bbox . yMax = FT_NEXT_SHORT ( p ) ; <nl> <nl> FT_TRACE5 ( ( " # of contours : % d \ n " , loader - > n_contours ) ) ; <nl> - FT_TRACE5 ( ( " xMin : % 4d xMax : % 4d \ n " , loader - > bbox . xMin , <nl> + FT_TRACE5 ( ( " xMin : % 4ld xMax : % 4ld \ n " , loader - > bbox . xMin , <nl> loader - > bbox . xMax ) ) ; <nl> - FT_TRACE5 ( ( " yMin : % 4d yMax : % 4d \ n " , loader - > bbox . yMin , <nl> + FT_TRACE5 ( ( " yMin : % 4ld yMax : % 4ld \ n " , loader - > bbox . yMin , <nl> loader - > bbox . yMax ) ) ; <nl> loader - > cursor = p ; <nl> <nl> <nl> } <nl> } <nl> <nl> + / * retain the overlap flag * / <nl> + if ( n_points & & outline - > tags [ 0 ] & OVERLAP_SIMPLE ) <nl> + gloader - > base . outline . flags | = FT_OUTLINE_OVERLAP ; <nl> + <nl> / * reading the X coordinates * / <nl> <nl> vec = outline - > points ; <nl> <nl> goto Exit ; <nl> } <nl> } <nl> + <nl> + / * retain the overlap flag * / <nl> + if ( gloader - > base . num_subglyphs & & <nl> + gloader - > base . subglyphs [ 0 ] . flags & OVERLAP_COMPOUND ) <nl> + gloader - > base . outline . flags | = FT_OUTLINE_OVERLAP ; <nl> } <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> <nl> error = compute_glyph_metrics ( & loader , glyph_index ) ; <nl> } <nl> <nl> - tt_loader_done ( & loader ) ; <nl> - <nl> / * Set the ` high precision ' bit flag . * / <nl> / * This is _critical_ to get correct output for monochrome * / <nl> / * TrueType glyphs at all sizes using the bytecode interpreter . * / <nl> <nl> size - > metrics - > y_ppem < 24 ) <nl> glyph - > outline . flags | = FT_OUTLINE_HIGH_PRECISION ; <nl> <nl> + FT_TRACE1 ( ( " subglyphs = % u , contours = % hd , points = % hd , " <nl> + " flags = 0x % . 3x \ n " , <nl> + loader . gloader - > base . num_subglyphs , <nl> + glyph - > outline . n_contours , <nl> + glyph - > outline . n_points , <nl> + glyph - > outline . flags ) ) ; <nl> + <nl> + tt_loader_done ( & loader ) ; <nl> + <nl> Exit : <nl> # ifdef FT_DEBUG_LEVEL_TRACE <nl> if ( error ) <nl> mmm a / thirdparty / freetype / src / truetype / ttgload . h <nl> ppp b / thirdparty / freetype / src / truetype / ttgload . h <nl> <nl> # define TTGLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttobjs . h " <nl> <nl> # ifdef TT_USE_BYTECODE_INTERPRETER <nl> mmm a / thirdparty / freetype / src / truetype / ttgxvar . c <nl> ppp b / thirdparty / freetype / src / truetype / ttgxvar . c <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_TRUETYPE_IDS_H <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_LIST_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ttnameid . h > <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / ftlist . h > <nl> <nl> # include " ttpload . h " <nl> # include " ttgxvar . h " <nl> <nl> <nl> if ( tuple_coords [ i ] = = 0 ) <nl> { <nl> - FT_TRACE6 ( ( " tuple coordinate is zero , ignore \ n " , i ) ) ; <nl> + FT_TRACE6 ( ( " tuple coordinate is zero , ignore \ n " ) ) ; <nl> continue ; <nl> } <nl> <nl> mmm a / thirdparty / freetype / src / truetype / ttgxvar . h <nl> ppp b / thirdparty / freetype / src / truetype / ttgxvar . h <nl> <nl> # define TTGXVAR_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " ttobjs . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / truetype / ttinterp . c <nl> ppp b / thirdparty / freetype / src / truetype / ttinterp . c <nl> <nl> / * issues ; many thanks ! * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_TRIGONOMETRY_H <nl> - # include FT_SYSTEM_H <nl> - # include FT_DRIVER_H <nl> - # include FT_MULTIPLE_MASTERS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / fttrigon . h > <nl> + # include < freetype / ftsystem . h > <nl> + # include < freetype / ftdriver . h > <nl> + # include < freetype / ftmm . h > <nl> <nl> # include " ttinterp . h " <nl> # include " tterrors . h " <nl> <nl> FT_Error error ; <nl> <nl> <nl> - FT_TRACE1 ( ( " Init_Context : new object at 0x % 08p \ n " , exec ) ) ; <nl> + FT_TRACE1 ( ( " Init_Context : new object at % p \ n " , ( void * ) exec ) ) ; <nl> <nl> exec - > memory = memory ; <nl> exec - > callSize = 32 ; <nl> <nl> return FT_Err_Ok ; <nl> <nl> Fail_Memory : <nl> - FT_ERROR ( ( " Init_Context : not enough memory for % p \ n " , exec ) ) ; <nl> + FT_ERROR ( ( " Init_Context : not enough memory for % p \ n " , ( void * ) exec ) ) ; <nl> TT_Done_Context ( exec ) ; <nl> <nl> return error ; <nl> <nl> * distance : : <nl> * The distance ( not ) to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * The compensated distance . <nl> <nl> static FT_F26Dot6 <nl> Round_None ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> - FT_UNUSED ( exc ) ; <nl> - <nl> <nl> if ( distance > = 0 ) <nl> { <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_To_Grid ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> - FT_UNUSED ( exc ) ; <nl> - <nl> <nl> if ( distance > = 0 ) <nl> { <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_To_Half_Grid ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> - FT_UNUSED ( exc ) ; <nl> - <nl> <nl> if ( distance > = 0 ) <nl> { <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_Down_To_Grid ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> - FT_UNUSED ( exc ) ; <nl> - <nl> <nl> if ( distance > = 0 ) <nl> { <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_Up_To_Grid ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> - FT_UNUSED ( exc ) ; <nl> - <nl> <nl> if ( distance > = 0 ) <nl> { <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_To_Double_Grid ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> - FT_UNUSED ( exc ) ; <nl> - <nl> <nl> if ( distance > = 0 ) <nl> { <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_Super ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> <nl> <nl> * distance : : <nl> * The distance to round . <nl> * <nl> - * compensation : : <nl> - * The engine compensation . <nl> + * color : : <nl> + * The engine compensation color . <nl> * <nl> * @ Return : <nl> * Rounded distance . <nl> <nl> static FT_F26Dot6 <nl> Round_Super_45 ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) <nl> + FT_Int color ) <nl> { <nl> + FT_F26Dot6 compensation = exc - > tt_metrics . compensations [ color ] ; <nl> FT_F26Dot6 val ; <nl> <nl> <nl> <nl> Ins_ODD ( TT_ExecContext exc , <nl> FT_Long * args ) <nl> { <nl> - args [ 0 ] = ( ( exc - > func_round ( exc , args [ 0 ] , 0 ) & 127 ) = = 64 ) ; <nl> + args [ 0 ] = ( ( exc - > func_round ( exc , args [ 0 ] , 3 ) & 127 ) = = 64 ) ; <nl> } <nl> <nl> <nl> <nl> Ins_EVEN ( TT_ExecContext exc , <nl> FT_Long * args ) <nl> { <nl> - args [ 0 ] = ( ( exc - > func_round ( exc , args [ 0 ] , 0 ) & 127 ) = = 0 ) ; <nl> + args [ 0 ] = ( ( exc - > func_round ( exc , args [ 0 ] , 3 ) & 127 ) = = 0 ) ; <nl> } <nl> <nl> <nl> <nl> Ins_ROUND ( TT_ExecContext exc , <nl> FT_Long * args ) <nl> { <nl> - args [ 0 ] = exc - > func_round ( <nl> - exc , <nl> - args [ 0 ] , <nl> - exc - > tt_metrics . compensations [ exc - > opcode - 0x68 ] ) ; <nl> + args [ 0 ] = exc - > func_round ( exc , args [ 0 ] , exc - > opcode & 3 ) ; <nl> } <nl> <nl> <nl> <nl> Ins_NROUND ( TT_ExecContext exc , <nl> FT_Long * args ) <nl> { <nl> - args [ 0 ] = Round_None ( <nl> - exc , <nl> - args [ 0 ] , <nl> - exc - > tt_metrics . compensations [ exc - > opcode - 0x6C ] ) ; <nl> + args [ 0 ] = Round_None ( exc , args [ 0 ] , exc - > opcode & 3 ) ; <nl> } <nl> <nl> <nl> <nl> { <nl> FT_F26Dot6 dx , dy ; <nl> FT_UShort point ; <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - FT_Int B1 , B2 ; <nl> - # endif <nl> # ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL <nl> FT_Bool in_twilight = FT_BOOL ( exc - > GS . gep0 = = 0 | | <nl> exc - > GS . gep1 = = 0 | | <nl> <nl> } <nl> else <nl> # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY ) <nl> + if ( SUBPIXEL_HINTING_INFINALITY & & <nl> + exc - > ignore_x_mode ) <nl> { <nl> + FT_Int B1 , B2 ; <nl> + <nl> + <nl> / * If not using ignore_x_mode rendering , allow ZP2 move . * / <nl> / * If inline deltas aren ' t allowed , skip ZP2 move . * / <nl> / * If using ignore_x_mode rendering , allow ZP2 point move if : * / <nl> <nl> / * - the glyph is specifically set to allow SHPIX moves * / <nl> / * - the move is on a previously Y - touched point * / <nl> <nl> - if ( exc - > ignore_x_mode ) <nl> + / * save point for later comparison * / <nl> + B1 = exc - > zp2 . cur [ point ] . y ; <nl> + <nl> + if ( exc - > face - > sph_compatibility_mode ) <nl> { <nl> - / * save point for later comparison * / <nl> + if ( exc - > sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) <nl> + dy = FT_PIX_ROUND ( B1 + dy ) - B1 ; <nl> + <nl> + / * skip post - iup deltas * / <nl> + if ( exc - > iup_called & & <nl> + ( ( exc - > sph_in_func_flags & SPH_FDEF_INLINE_DELTA_1 ) | | <nl> + ( exc - > sph_in_func_flags & SPH_FDEF_INLINE_DELTA_2 ) ) ) <nl> + goto Skip ; <nl> + <nl> + if ( ! ( exc - > sph_tweak_flags & SPH_TWEAK_ALWAYS_SKIP_DELTAP ) & & <nl> + ( ( exc - > is_composite & & exc - > GS . freeVector . y ! = 0 ) | | <nl> + ( exc - > zp2 . tags [ point ] & FT_CURVE_TAG_TOUCH_Y ) | | <nl> + ( exc - > sph_tweak_flags & SPH_TWEAK_DO_SHPIX ) ) ) <nl> + Move_Zp2_Point ( exc , point , 0 , dy , TRUE ) ; <nl> + <nl> + / * save new point * / <nl> if ( exc - > GS . freeVector . y ! = 0 ) <nl> - B1 = exc - > zp2 . cur [ point ] . y ; <nl> - else <nl> - B1 = exc - > zp2 . cur [ point ] . x ; <nl> - <nl> - if ( ! exc - > face - > sph_compatibility_mode & & <nl> - exc - > GS . freeVector . y ! = 0 ) <nl> { <nl> - Move_Zp2_Point ( exc , point , dx , dy , TRUE ) ; <nl> + B2 = exc - > zp2 . cur [ point ] . y ; <nl> <nl> - / * save new point * / <nl> - if ( exc - > GS . freeVector . y ! = 0 ) <nl> - { <nl> - B2 = exc - > zp2 . cur [ point ] . y ; <nl> - <nl> - / * reverse any disallowed moves * / <nl> - if ( ( exc - > sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES ) & & <nl> - ( B1 & 63 ) ! = 0 & & <nl> - ( B2 & 63 ) ! = 0 & & <nl> - B1 ! = B2 ) <nl> - Move_Zp2_Point ( exc , <nl> - point , <nl> - NEG_LONG ( dx ) , <nl> - NEG_LONG ( dy ) , <nl> - TRUE ) ; <nl> - } <nl> + / * reverse any disallowed moves * / <nl> + if ( ( B1 & 63 ) = = 0 & & <nl> + ( B2 & 63 ) ! = 0 & & <nl> + B1 ! = B2 ) <nl> + Move_Zp2_Point ( exc , point , 0 , NEG_LONG ( dy ) , TRUE ) ; <nl> } <nl> - else if ( exc - > face - > sph_compatibility_mode ) <nl> - { <nl> - if ( exc - > sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) <nl> - { <nl> - dx = FT_PIX_ROUND ( B1 + dx ) - B1 ; <nl> - dy = FT_PIX_ROUND ( B1 + dy ) - B1 ; <nl> - } <nl> - <nl> - / * skip post - iup deltas * / <nl> - if ( exc - > iup_called & & <nl> - ( ( exc - > sph_in_func_flags & SPH_FDEF_INLINE_DELTA_1 ) | | <nl> - ( exc - > sph_in_func_flags & SPH_FDEF_INLINE_DELTA_2 ) ) ) <nl> - goto Skip ; <nl> - <nl> - if ( ! ( exc - > sph_tweak_flags & SPH_TWEAK_ALWAYS_SKIP_DELTAP ) & & <nl> - ( ( exc - > is_composite & & exc - > GS . freeVector . y ! = 0 ) | | <nl> - ( exc - > zp2 . tags [ point ] & FT_CURVE_TAG_TOUCH_Y ) | | <nl> - ( exc - > sph_tweak_flags & SPH_TWEAK_DO_SHPIX ) ) ) <nl> - Move_Zp2_Point ( exc , point , 0 , dy , TRUE ) ; <nl> - <nl> - / * save new point * / <nl> - if ( exc - > GS . freeVector . y ! = 0 ) <nl> - { <nl> - B2 = exc - > zp2 . cur [ point ] . y ; <nl> + } <nl> + else if ( exc - > GS . freeVector . y ! = 0 ) <nl> + { <nl> + Move_Zp2_Point ( exc , point , dx , dy , TRUE ) ; <nl> <nl> - / * reverse any disallowed moves * / <nl> - if ( ( B1 & 63 ) = = 0 & & <nl> - ( B2 & 63 ) ! = 0 & & <nl> - B1 ! = B2 ) <nl> - Move_Zp2_Point ( exc , point , 0 , NEG_LONG ( dy ) , TRUE ) ; <nl> - } <nl> - } <nl> - else if ( exc - > sph_in_func_flags & SPH_FDEF_TYPEMAN_DIAGENDCTRL ) <nl> - Move_Zp2_Point ( exc , point , dx , dy , TRUE ) ; <nl> + / * save new point * / <nl> + B2 = exc - > zp2 . cur [ point ] . y ; <nl> + <nl> + / * reverse any disallowed moves * / <nl> + if ( ( exc - > sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES ) & & <nl> + ( B1 & 63 ) ! = 0 & & <nl> + ( B2 & 63 ) ! = 0 & & <nl> + B1 ! = B2 ) <nl> + Move_Zp2_Point ( exc , <nl> + point , <nl> + NEG_LONG ( dx ) , <nl> + NEG_LONG ( dy ) , <nl> + TRUE ) ; <nl> } <nl> - else <nl> + else if ( exc - > sph_in_func_flags & SPH_FDEF_TYPEMAN_DIAGENDCTRL ) <nl> Move_Zp2_Point ( exc , point , dx , dy , TRUE ) ; <nl> } <nl> else <nl> <nl> { <nl> FT_UShort point = 0 ; <nl> FT_F26Dot6 distance ; <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - FT_F26Dot6 control_value_cutin = 0 ; <nl> - FT_F26Dot6 delta ; <nl> <nl> <nl> - if ( SUBPIXEL_HINTING_INFINALITY ) <nl> - { <nl> - control_value_cutin = exc - > GS . control_value_cutin ; <nl> - <nl> - if ( exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . x ! = 0 & & <nl> - ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> - control_value_cutin = 0 ; <nl> - } <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> - <nl> point = ( FT_UShort ) args [ 0 ] ; <nl> <nl> if ( BOUNDS ( point , exc - > zp1 . n_points ) | | <nl> <nl> distance = PROJECT ( exc - > zp1 . cur + point , exc - > zp0 . cur + exc - > GS . rp0 ) ; <nl> <nl> # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - delta = SUB_LONG ( distance , args [ 1 ] ) ; <nl> - if ( delta < 0 ) <nl> - delta = NEG_LONG ( delta ) ; <nl> - <nl> / * subpixel hinting - make MSIRP respect CVT cut - in ; * / <nl> - if ( SUBPIXEL_HINTING_INFINALITY & & <nl> - exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . x ! = 0 & & <nl> - delta > = control_value_cutin ) <nl> - distance = args [ 1 ] ; <nl> + if ( SUBPIXEL_HINTING_INFINALITY & & <nl> + exc - > ignore_x_mode & & <nl> + exc - > GS . freeVector . x ! = 0 ) <nl> + { <nl> + FT_F26Dot6 control_value_cutin = exc - > GS . control_value_cutin ; <nl> + FT_F26Dot6 delta ; <nl> + <nl> + <nl> + if ( ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> + control_value_cutin = 0 ; <nl> + <nl> + delta = SUB_LONG ( distance , args [ 1 ] ) ; <nl> + if ( delta < 0 ) <nl> + delta = NEG_LONG ( delta ) ; <nl> + <nl> + if ( delta > = control_value_cutin ) <nl> + distance = args [ 1 ] ; <nl> + } <nl> # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> <nl> exc - > func_move ( exc , <nl> <nl> if ( SUBPIXEL_HINTING_INFINALITY & & <nl> exc - > ignore_x_mode & & <nl> exc - > GS . freeVector . x ! = 0 ) <nl> - distance = SUB_LONG ( <nl> - Round_None ( exc , <nl> - cur_dist , <nl> - exc - > tt_metrics . compensations [ 0 ] ) , <nl> - cur_dist ) ; <nl> + distance = SUB_LONG ( Round_None ( exc , cur_dist , 3 ) , cur_dist ) ; <nl> else <nl> # endif <nl> - distance = SUB_LONG ( <nl> - exc - > func_round ( exc , <nl> - cur_dist , <nl> - exc - > tt_metrics . compensations [ 0 ] ) , <nl> - cur_dist ) ; <nl> + distance = SUB_LONG ( exc - > func_round ( exc , cur_dist , 3 ) , cur_dist ) ; <nl> } <nl> else <nl> distance = 0 ; <nl> <nl> FT_UShort point ; <nl> FT_F26Dot6 distance ; <nl> FT_F26Dot6 org_dist ; <nl> - FT_F26Dot6 control_value_cutin ; <nl> - <nl> <nl> - control_value_cutin = exc - > GS . control_value_cutin ; <nl> - cvtEntry = ( FT_ULong ) args [ 1 ] ; <nl> - point = ( FT_UShort ) args [ 0 ] ; <nl> <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY & & <nl> - exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . x ! = 0 & & <nl> - exc - > GS . freeVector . y = = 0 & & <nl> - ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> - control_value_cutin = 0 ; <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> + cvtEntry = ( FT_ULong ) args [ 1 ] ; <nl> + point = ( FT_UShort ) args [ 0 ] ; <nl> <nl> if ( BOUNDS ( point , exc - > zp0 . n_points ) | | <nl> BOUNDSL ( cvtEntry , exc - > cvtSize ) ) <nl> <nl> exc - > zp0 . org [ point ] . x = TT_MulFix14 ( distance , <nl> exc - > GS . freeVector . x ) ; <nl> exc - > zp0 . org [ point ] . y = TT_MulFix14 ( distance , <nl> - exc - > GS . freeVector . y ) , <nl> + exc - > GS . freeVector . y ) ; <nl> exc - > zp0 . cur [ point ] = exc - > zp0 . org [ point ] ; <nl> } <nl> # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> <nl> <nl> if ( ( exc - > opcode & 1 ) ! = 0 ) / * rounding and control cut - in flag * / <nl> { <nl> + FT_F26Dot6 control_value_cutin = exc - > GS . control_value_cutin ; <nl> FT_F26Dot6 delta ; <nl> <nl> <nl> + # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> + if ( SUBPIXEL_HINTING_INFINALITY & & <nl> + exc - > ignore_x_mode & & <nl> + exc - > GS . freeVector . x ! = 0 & & <nl> + exc - > GS . freeVector . y = = 0 & & <nl> + ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> + control_value_cutin = 0 ; <nl> + # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> + <nl> delta = SUB_LONG ( distance , org_dist ) ; <nl> if ( delta < 0 ) <nl> delta = NEG_LONG ( delta ) ; <nl> <nl> if ( SUBPIXEL_HINTING_INFINALITY & & <nl> exc - > ignore_x_mode & & <nl> exc - > GS . freeVector . x ! = 0 ) <nl> - distance = Round_None ( exc , <nl> - distance , <nl> - exc - > tt_metrics . compensations [ 0 ] ) ; <nl> + distance = Round_None ( exc , distance , 3 ) ; <nl> else <nl> # endif <nl> - distance = exc - > func_round ( exc , <nl> - distance , <nl> - exc - > tt_metrics . compensations [ 0 ] ) ; <nl> + distance = exc - > func_round ( exc , distance , 3 ) ; <nl> } <nl> <nl> exc - > func_move ( exc , & exc - > zp0 , point , SUB_LONG ( distance , org_dist ) ) ; <nl> <nl> FT_Long * args ) <nl> { <nl> FT_UShort point = 0 ; <nl> - FT_F26Dot6 org_dist , distance , minimum_distance ; <nl> - <nl> + FT_F26Dot6 org_dist , distance ; <nl> <nl> - minimum_distance = exc - > GS . minimum_distance ; <nl> - <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY & & <nl> - exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . x ! = 0 & & <nl> - ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> - minimum_distance = 0 ; <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> <nl> point = ( FT_UShort ) args [ 0 ] ; <nl> <nl> <nl> if ( SUBPIXEL_HINTING_INFINALITY & & <nl> exc - > ignore_x_mode & & <nl> exc - > GS . freeVector . x ! = 0 ) <nl> - distance = Round_None ( <nl> - exc , <nl> - org_dist , <nl> - exc - > tt_metrics . compensations [ exc - > opcode & 3 ] ) ; <nl> + distance = Round_None ( exc , org_dist , exc - > opcode & 3 ) ; <nl> else <nl> # endif <nl> - distance = exc - > func_round ( <nl> - exc , <nl> - org_dist , <nl> - exc - > tt_metrics . compensations [ exc - > opcode & 3 ] ) ; <nl> + distance = exc - > func_round ( exc , org_dist , exc - > opcode & 3 ) ; <nl> } <nl> else <nl> - distance = Round_None ( <nl> - exc , <nl> - org_dist , <nl> - exc - > tt_metrics . compensations [ exc - > opcode & 3 ] ) ; <nl> + distance = Round_None ( exc , org_dist , exc - > opcode & 3 ) ; <nl> <nl> / * minimum distance flag * / <nl> <nl> if ( ( exc - > opcode & 8 ) ! = 0 ) <nl> { <nl> + FT_F26Dot6 minimum_distance = exc - > GS . minimum_distance ; <nl> + <nl> + <nl> + # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> + if ( SUBPIXEL_HINTING_INFINALITY & & <nl> + exc - > ignore_x_mode & & <nl> + exc - > GS . freeVector . x ! = 0 & & <nl> + ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> + minimum_distance = 0 ; <nl> + # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> + <nl> if ( org_dist > = 0 ) <nl> { <nl> if ( distance < minimum_distance ) <nl> <nl> FT_F26Dot6 cvt_dist , <nl> distance , <nl> cur_dist , <nl> - org_dist , <nl> - control_value_cutin , <nl> - minimum_distance ; <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - FT_Int B1 = 0 ; / * pacify compiler * / <nl> - FT_Int B2 = 0 ; <nl> - FT_Bool reverse_move = FALSE ; <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> + org_dist ; <nl> <nl> FT_F26Dot6 delta ; <nl> <nl> <nl> - minimum_distance = exc - > GS . minimum_distance ; <nl> - control_value_cutin = exc - > GS . control_value_cutin ; <nl> - point = ( FT_UShort ) args [ 0 ] ; <nl> - cvtEntry = ( FT_ULong ) ( ADD_LONG ( args [ 1 ] , 1 ) ) ; <nl> - <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY & & <nl> - exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . x ! = 0 & & <nl> - ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> - control_value_cutin = minimum_distance = 0 ; <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> + point = ( FT_UShort ) args [ 0 ] ; <nl> + cvtEntry = ( FT_ULong ) ( ADD_LONG ( args [ 1 ] , 1 ) ) ; <nl> <nl> / * XXX : UNDOCUMENTED ! cvt [ - 1 ] = 0 always * / <nl> <nl> <nl> cvt_dist = NEG_LONG ( cvt_dist ) ; <nl> } <nl> <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY & & <nl> - exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . y ! = 0 & & <nl> - ( exc - > sph_tweak_flags & SPH_TWEAK_TIMES_NEW_ROMAN_HACK ) ) <nl> - { <nl> - if ( cur_dist < - 64 ) <nl> - cvt_dist - = 16 ; <nl> - else if ( cur_dist > 64 & & cur_dist < 84 ) <nl> - cvt_dist + = 32 ; <nl> - } <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> - <nl> / * control value cut - in and round * / <nl> <nl> if ( ( exc - > opcode & 4 ) ! = 0 ) <nl> <nl> <nl> if ( exc - > GS . gep0 = = exc - > GS . gep1 ) <nl> { <nl> + FT_F26Dot6 control_value_cutin = exc - > GS . control_value_cutin ; <nl> + <nl> + <nl> / * XXX : According to Greg Hitchcock , the following wording is * / <nl> / * the right one : * / <nl> / * * / <nl> <nl> cvt_dist = org_dist ; <nl> } <nl> <nl> - distance = exc - > func_round ( <nl> - exc , <nl> - cvt_dist , <nl> - exc - > tt_metrics . compensations [ exc - > opcode & 3 ] ) ; <nl> + distance = exc - > func_round ( exc , cvt_dist , exc - > opcode & 3 ) ; <nl> } <nl> else <nl> { <nl> <nl> exc - > ignore_x_mode & & <nl> exc - > GS . gep0 = = exc - > GS . gep1 ) <nl> { <nl> + FT_F26Dot6 control_value_cutin = exc - > GS . control_value_cutin ; <nl> + <nl> + <nl> + if ( exc - > GS . freeVector . x ! = 0 & & <nl> + ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> + control_value_cutin = 0 ; <nl> + <nl> + if ( exc - > GS . freeVector . y ! = 0 & & <nl> + ( exc - > sph_tweak_flags & SPH_TWEAK_TIMES_NEW_ROMAN_HACK ) ) <nl> + { <nl> + if ( cur_dist < - 64 ) <nl> + cvt_dist - = 16 ; <nl> + else if ( cur_dist > 64 & & cur_dist < 84 ) <nl> + cvt_dist + = 32 ; <nl> + } <nl> + <nl> delta = SUB_LONG ( cvt_dist , org_dist ) ; <nl> if ( delta < 0 ) <nl> delta = NEG_LONG ( delta ) ; <nl> <nl> } <nl> # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> <nl> - distance = Round_None ( <nl> - exc , <nl> - cvt_dist , <nl> - exc - > tt_metrics . compensations [ exc - > opcode & 3 ] ) ; <nl> + distance = Round_None ( exc , cvt_dist , exc - > opcode & 3 ) ; <nl> } <nl> <nl> / * minimum distance test * / <nl> <nl> if ( ( exc - > opcode & 8 ) ! = 0 ) <nl> { <nl> + FT_F26Dot6 minimum_distance = exc - > GS . minimum_distance ; <nl> + <nl> + <nl> + # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> + if ( SUBPIXEL_HINTING_INFINALITY & & <nl> + exc - > ignore_x_mode & & <nl> + exc - > GS . freeVector . x ! = 0 & & <nl> + ! ( exc - > sph_tweak_flags & SPH_TWEAK_NORMAL_ROUND ) ) <nl> + minimum_distance = 0 ; <nl> + # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> + <nl> if ( org_dist > = 0 ) <nl> { <nl> if ( distance < minimum_distance ) <nl> <nl> } <nl> <nl> # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY ) <nl> + if ( SUBPIXEL_HINTING_INFINALITY & & <nl> + exc - > ignore_x_mode & & <nl> + exc - > GS . freeVector . y ! = 0 ) <nl> { <nl> + FT_Int B1 , B2 ; <nl> + <nl> + <nl> B1 = exc - > zp1 . cur [ point ] . y ; <nl> <nl> / * Round moves if necessary * / <nl> - if ( exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . y ! = 0 & & <nl> - ( exc - > sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) ) <nl> + if ( exc - > sph_tweak_flags & SPH_TWEAK_ROUND_NONPIXEL_Y_MOVES ) <nl> distance = FT_PIX_ROUND ( B1 + distance - cur_dist ) - B1 + cur_dist ; <nl> <nl> - if ( exc - > ignore_x_mode & & <nl> - exc - > GS . freeVector . y ! = 0 & & <nl> - ( exc - > opcode & 16 ) = = 0 & & <nl> + if ( ( exc - > opcode & 16 ) = = 0 & & <nl> ( exc - > opcode & 8 ) = = 0 & & <nl> ( exc - > sph_tweak_flags & SPH_TWEAK_COURIER_NEW_2_HACK ) ) <nl> distance + = 64 ; <nl> - } <nl> - # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> <nl> - exc - > func_move ( exc , <nl> - & exc - > zp1 , <nl> - point , <nl> - SUB_LONG ( distance , cur_dist ) ) ; <nl> + exc - > func_move ( exc , <nl> + & exc - > zp1 , <nl> + point , <nl> + SUB_LONG ( distance , cur_dist ) ) ; <nl> <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - if ( SUBPIXEL_HINTING_INFINALITY ) <nl> - { <nl> B2 = exc - > zp1 . cur [ point ] . y ; <nl> <nl> / * Reverse move if necessary * / <nl> - if ( exc - > ignore_x_mode ) <nl> - { <nl> - if ( exc - > face - > sph_compatibility_mode & & <nl> - exc - > GS . freeVector . y ! = 0 & & <nl> + if ( ( exc - > face - > sph_compatibility_mode & & <nl> ( B1 & 63 ) = = 0 & & <nl> - ( B2 & 63 ) ! = 0 ) <nl> - reverse_move = TRUE ; <nl> - <nl> - if ( ( exc - > sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES ) & & <nl> - exc - > GS . freeVector . y ! = 0 & & <nl> - ( B2 & 63 ) ! = 0 & & <nl> - ( B1 & 63 ) ! = 0 ) <nl> - reverse_move = TRUE ; <nl> - } <nl> - <nl> - if ( reverse_move ) <nl> + ( B2 & 63 ) ! = 0 ) | | <nl> + ( ( exc - > sph_tweak_flags & SPH_TWEAK_SKIP_NONPIXEL_Y_MOVES ) & & <nl> + ( B1 & 63 ) ! = 0 & & <nl> + ( B2 & 63 ) ! = 0 ) ) <nl> exc - > func_move ( exc , <nl> & exc - > zp1 , <nl> point , <nl> SUB_LONG ( cur_dist , distance ) ) ; <nl> } <nl> - <nl> + else <nl> # endif / * TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY * / <nl> <nl> + exc - > func_move ( exc , <nl> + & exc - > zp1 , <nl> + point , <nl> + SUB_LONG ( distance , cur_dist ) ) ; <nl> + <nl> Fail : <nl> exc - > GS . rp1 = exc - > GS . rp0 ; <nl> <nl> <nl> FT_UShort A ; <nl> FT_ULong C , P ; <nl> FT_Long B ; <nl> - # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> - FT_UShort B1 , B2 ; <nl> <nl> <nl> + # ifdef TT_SUPPORT_SUBPIXEL_HINTING_INFINALITY <nl> if ( SUBPIXEL_HINTING_INFINALITY & & <nl> exc - > ignore_x_mode & & <nl> exc - > iup_called & & <nl> <nl> / * rules , always skipping deltas in subpixel direction . * / <nl> else if ( exc - > ignore_x_mode & & exc - > GS . freeVector . y ! = 0 ) <nl> { <nl> + FT_UShort B1 , B2 ; <nl> + <nl> + <nl> / * save the y value of the point now ; compare after move * / <nl> B1 = ( FT_UShort ) exc - > zp0 . cur [ A ] . y ; <nl> <nl> <nl> num_twilight_points = 0xFFFFU ; <nl> <nl> FT_TRACE5 ( ( " TT_RunIns : Resetting number of twilight points \ n " <nl> - " from % d to the more reasonable value % d \ n " , <nl> + " from % d to the more reasonable value % ld \ n " , <nl> exc - > twilight . n_points , <nl> num_twilight_points ) ) ; <nl> exc - > twilight . n_points = ( FT_UShort ) num_twilight_points ; <nl> <nl> exc - > loopcall_counter_max = 100 * ( FT_ULong ) exc - > face - > root . num_glyphs ; <nl> <nl> FT_TRACE5 ( ( " TT_RunIns : Limiting total number of loops in LOOPCALL " <nl> - " to % d \ n " , exc - > loopcall_counter_max ) ) ; <nl> + " to % ld \ n " , exc - > loopcall_counter_max ) ) ; <nl> <nl> exc - > neg_jump_counter_max = exc - > loopcall_counter_max ; <nl> FT_TRACE5 ( ( " TT_RunIns : Limiting total number of backward jumps " <nl> - " to % d \ n " , exc - > neg_jump_counter_max ) ) ; <nl> + " to % ld \ n " , exc - > neg_jump_counter_max ) ) ; <nl> <nl> / * set PPEM and CVT functions * / <nl> exc - > tt_metrics . ratio = 0 ; <nl> <nl> / * if tracing level is 7 , show current code position * / <nl> / * and the first few stack elements also * / <nl> FT_TRACE6 ( ( " " ) ) ; <nl> - FT_TRACE7 ( ( " % 06d " , exc - > IP ) ) ; <nl> + FT_TRACE7 ( ( " % 06ld " , exc - > IP ) ) ; <nl> FT_TRACE6 ( ( " % s " , opcode_name [ exc - > opcode ] + 2 ) ) ; <nl> FT_TRACE7 ( ( " % * s " , * opcode_name [ exc - > opcode ] = = ' A ' <nl> ? 2 <nl> : 12 - ( * opcode_name [ exc - > opcode ] - ' 0 ' ) , <nl> " # " ) ) ; <nl> for ( n = 1 ; n < = cnt ; n + + ) <nl> - FT_TRACE7 ( ( " % d " , exc - > stack [ exc - > top - n ] ) ) ; <nl> + FT_TRACE7 ( ( " % ld " , exc - > stack [ exc - > top - n ] ) ) ; <nl> FT_TRACE6 ( ( " \ n " ) ) ; <nl> } <nl> # endif / * FT_DEBUG_LEVEL_TRACE * / <nl> <nl> } while ( ! exc - > instruction_trap ) ; <nl> <nl> LNo_Error_ : <nl> - FT_TRACE4 ( ( " % d instruction % s executed \ n " , <nl> + FT_TRACE4 ( ( " % ld instruction % s executed \ n " , <nl> ins_counter , <nl> ins_counter = = 1 ? " " : " s " ) ) ; <nl> return FT_Err_Ok ; <nl> mmm a / thirdparty / freetype / src / truetype / ttinterp . h <nl> ppp b / thirdparty / freetype / src / truetype / ttinterp . h <nl> <nl> # ifndef TTINTERP_H_ <nl> # define TTINTERP_H_ <nl> <nl> - # include < ft2build . h > <nl> # include " ttobjs . h " <nl> <nl> <nl> FT_BEGIN_HEADER <nl> typedef FT_F26Dot6 <nl> ( * TT_Round_Func ) ( TT_ExecContext exc , <nl> FT_F26Dot6 distance , <nl> - FT_F26Dot6 compensation ) ; <nl> + FT_Int color ) ; <nl> <nl> / * Point displacement along the freedom vector routine * / <nl> typedef void <nl> mmm a / thirdparty / freetype / src / truetype / ttobjs . c <nl> ppp b / thirdparty / freetype / src / truetype / ttobjs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " ttgload . h " <nl> # include " ttpload . h " <nl> <nl> / * The Apple specification says that the compensation for * / <nl> / * ` gray ' is always zero . FreeType doesn ' t do any * / <nl> / * compensation at all . * / <nl> - tt_metrics - > compensations [ 0 ] = 0 ; / * gray * / <nl> - tt_metrics - > compensations [ 1 ] = 0 ; / * black * / <nl> - tt_metrics - > compensations [ 2 ] = 0 ; / * white * / <nl> - tt_metrics - > compensations [ 3 ] = 0 ; / * the same as gray * / <nl> + tt_metrics - > compensations [ 0 ] = 0 ; / * gray * / <nl> + tt_metrics - > compensations [ 1 ] = 0 ; / * black * / <nl> + tt_metrics - > compensations [ 2 ] = 0 ; / * white * / <nl> + tt_metrics - > compensations [ 3 ] = 0 ; / * zero * / <nl> } <nl> <nl> / * allocate function defs , instruction defs , cvt , and storage area * / <nl> mmm a / thirdparty / freetype / src / truetype / ttobjs . h <nl> ppp b / thirdparty / freetype / src / truetype / ttobjs . h <nl> <nl> # define TTOBJS_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / truetype / ttpload . c <nl> ppp b / thirdparty / freetype / src / truetype / ttpload . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / tttags . h > <nl> <nl> # include " ttpload . h " <nl> <nl> <nl> <nl> if ( face - > num_locations ! = ( FT_ULong ) face - > root . num_glyphs + 1 ) <nl> { <nl> - FT_TRACE2 ( ( " glyph count mismatch ! loca : % d , maxp : % d \ n " , <nl> + FT_TRACE2 ( ( " glyph count mismatch ! loca : % ld , maxp : % ld \ n " , <nl> face - > num_locations - 1 , face - > root . num_glyphs ) ) ; <nl> <nl> / * we only handle the case where ` maxp ' gives a larger value * / <nl> <nl> face - > num_locations = ( FT_ULong ) face - > root . num_glyphs + 1 ; <nl> table_len = new_loca_len ; <nl> <nl> - FT_TRACE2 ( ( " adjusting num_locations to % d \ n " , <nl> + FT_TRACE2 ( ( " adjusting num_locations to % ld \ n " , <nl> face - > num_locations ) ) ; <nl> } <nl> else <nl> <nl> face - > root . num_glyphs = face - > num_locations <nl> ? ( FT_Long ) face - > num_locations - 1 : 0 ; <nl> <nl> - FT_TRACE2 ( ( " adjusting num_glyphs to % d \ n " , <nl> + FT_TRACE2 ( ( " adjusting num_glyphs to % ld \ n " , <nl> face - > root . num_glyphs ) ) ; <nl> } <nl> } <nl> <nl> if ( pos1 > face - > glyf_len ) <nl> { <nl> FT_TRACE1 ( ( " tt_face_get_location : " <nl> - " too large offset ( 0x % 08lx ) found for glyph index % ld , \ n " <nl> + " too large offset ( 0x % 08lx ) found for glyph index % d , \ n " <nl> " " <nl> " exceeding the end of ` glyf ' table ( 0x % 08lx ) \ n " , <nl> pos1 , gindex , face - > glyf_len ) ) ; <nl> <nl> if ( gindex = = face - > num_locations - 2 ) <nl> { <nl> FT_TRACE1 ( ( " tt_face_get_location : " <nl> - " too large size ( % ld bytes ) found for glyph index % ld , \ n " <nl> + " too large size ( % ld bytes ) found for glyph index % d , \ n " <nl> " " <nl> " truncating at the end of ` glyf ' table to % ld bytes \ n " , <nl> pos2 - pos1 , gindex , face - > glyf_len - pos1 ) ) ; <nl> <nl> else <nl> { <nl> FT_TRACE1 ( ( " tt_face_get_location : " <nl> - " too large offset ( 0x % 08lx ) found for glyph index % ld , \ n " <nl> + " too large offset ( 0x % 08lx ) found for glyph index % d , \ n " <nl> " " <nl> " exceeding the end of ` glyf ' table ( 0x % 08lx ) \ n " , <nl> pos2 , gindex + 1 , face - > glyf_len ) ) ; <nl> <nl> if ( FT_FRAME_EXTRACT ( table_len , face - > font_program ) ) <nl> goto Exit ; <nl> <nl> - FT_TRACE2 ( ( " loaded , % 12d bytes \ n " , face - > font_program_size ) ) ; <nl> + FT_TRACE2 ( ( " loaded , % 12ld bytes \ n " , face - > font_program_size ) ) ; <nl> } <nl> <nl> Exit : <nl> <nl> if ( FT_FRAME_EXTRACT ( table_len , face - > cvt_program ) ) <nl> goto Exit ; <nl> <nl> - FT_TRACE2 ( ( " loaded , % 12d bytes \ n " , face - > cvt_program_size ) ) ; <nl> + FT_TRACE2 ( ( " loaded , % 12ld bytes \ n " , face - > cvt_program_size ) ) ; <nl> } <nl> <nl> Exit : <nl> mmm a / thirdparty / freetype / src / truetype / ttpload . h <nl> ppp b / thirdparty / freetype / src / truetype / ttpload . h <nl> <nl> # define TTPLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_TRUETYPE_TYPES_H <nl> + # include < freetype / internal / tttypes . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / truetype / ttsubpix . c <nl> ppp b / thirdparty / freetype / src / truetype / ttsubpix . c <nl> <nl> * <nl> * / <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_SFNT_H <nl> - # include FT_TRUETYPE_TAGS_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / sfnt . h > <nl> + # include < freetype / tttags . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " ttsubpix . h " <nl> <nl> mmm a / thirdparty / freetype / src / truetype / ttsubpix . h <nl> ppp b / thirdparty / freetype / src / truetype / ttsubpix . h <nl> <nl> # ifndef TTSUBPIX_H_ <nl> # define TTSUBPIX_H_ <nl> <nl> - # include < ft2build . h > <nl> # include " ttobjs . h " <nl> # include " ttinterp . h " <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1afm . c <nl> ppp b / thirdparty / freetype / src / type1 / t1afm . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " t1afm . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / psaux . h > <nl> # include " t1errors . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1afm . h <nl> ppp b / thirdparty / freetype / src / type1 / t1afm . h <nl> <nl> # ifndef T1AFM_H_ <nl> # define T1AFM_H_ <nl> <nl> - # include < ft2build . h > <nl> # include " t1objs . h " <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / internal / t1types . h > <nl> <nl> FT_BEGIN_HEADER <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1driver . c <nl> ppp b / thirdparty / freetype / src / type1 / t1driver . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " t1driver . h " <nl> # include " t1gload . h " <nl> # include " t1load . h " <nl> <nl> # include " t1afm . h " <nl> # endif <nl> <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_HASH_H <nl> - # include FT_INTERNAL_POSTSCRIPT_PROPS_H <nl> - # include FT_DRIVER_H <nl> - <nl> - # include FT_SERVICE_MULTIPLE_MASTERS_H <nl> - # include FT_SERVICE_GLYPH_DICT_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> - # include FT_SERVICE_POSTSCRIPT_NAME_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_SERVICE_POSTSCRIPT_INFO_H <nl> - # include FT_SERVICE_PROPERTIES_H <nl> - # include FT_SERVICE_KERNING_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / fthash . h > <nl> + # include < freetype / internal / ftpsprop . h > <nl> + # include < freetype / ftdriver . h > <nl> + <nl> + # include < freetype / internal / services / svmm . h > <nl> + # include < freetype / internal / services / svgldict . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> + # include < freetype / internal / services / svpostnm . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / services / svpsinfo . h > <nl> + # include < freetype / internal / services / svprop . h > <nl> + # include < freetype / internal / services / svkern . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> mmm a / thirdparty / freetype / src / type1 / t1driver . h <nl> ppp b / thirdparty / freetype / src / type1 / t1driver . h <nl> <nl> # define T1DRIVER_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type1 / t1errors . h <nl> ppp b / thirdparty / freetype / src / type1 / t1errors . h <nl> <nl> # ifndef T1ERRORS_H_ <nl> # define T1ERRORS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX T1_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Type1 <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * T1ERRORS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1gload . c <nl> ppp b / thirdparty / freetype / src / type1 / t1gload . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " t1gload . h " <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_OUTLINE_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_INTERNAL_CFF_TYPES_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / ftoutln . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / internal / cfftypes . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " t1errors . h " <nl> <nl> <nl> else <nl> advances [ nn ] = 0 ; <nl> <nl> - FT_TRACE5 ( ( " idx % d : advance width % d font unit % s \ n " , <nl> + FT_TRACE5 ( ( " idx % d : advance width % ld font unit % s \ n " , <nl> first + nn , <nl> advances [ nn ] , <nl> advances [ nn ] = = 1 ? " " : " s " ) ) ; <nl> mmm a / thirdparty / freetype / src / type1 / t1gload . h <nl> ppp b / thirdparty / freetype / src / type1 / t1gload . h <nl> <nl> # define T1GLOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> # include " t1objs . h " <nl> <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1load . c <nl> ppp b / thirdparty / freetype / src / type1 / t1load . c <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_MULTIPLE_MASTERS_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_HASH_H <nl> + # include < freetype / ftmm . h > <nl> + # include < freetype / internal / t1types . h > <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / fthash . h > <nl> <nl> # include " t1load . h " <nl> # include " t1errors . h " <nl> <nl> map - > design_points [ p ] = T1_ToInt ( parser ) ; <nl> map - > blend_points [ p ] = T1_ToFixed ( parser , 0 ) ; <nl> <nl> - FT_TRACE4 ( ( " [ % d % f ] " , <nl> + FT_TRACE4 ( ( " [ % ld % f ] " , <nl> map - > design_points [ p ] , <nl> ( double ) map - > blend_points [ p ] / 65536 ) ) ; <nl> } <nl> <nl> * / <nl> <nl> FT_TRACE0 ( ( " parse_subrs : adjusting number of subroutines " <nl> - " ( from % d to % d ) \ n " , <nl> + " ( from % d to % ld ) \ n " , <nl> num_subrs , <nl> ( parser - > root . limit - parser - > root . cursor ) > > 3 ) ) ; <nl> num_subrs = ( parser - > root . limit - parser - > root . cursor ) > > 3 ; <nl> <nl> if ( num_glyphs > ( limit - cur ) > > 3 ) <nl> { <nl> FT_TRACE0 ( ( " parse_charstrings : adjusting number of glyphs " <nl> - " ( from % d to % d ) \ n " , <nl> + " ( from % d to % ld ) \ n " , <nl> num_glyphs , ( limit - cur ) > > 3 ) ) ; <nl> num_glyphs = ( limit - cur ) > > 3 ; <nl> } <nl> mmm a / thirdparty / freetype / src / type1 / t1load . h <nl> ppp b / thirdparty / freetype / src / type1 / t1load . h <nl> <nl> # define T1LOAD_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> - # include FT_MULTIPLE_MASTERS_H <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / psaux . h > <nl> + # include < freetype / ftmm . h > <nl> <nl> # include " t1parse . h " <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1objs . c <nl> ppp b / thirdparty / freetype / src / type1 / t1objs . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_CALC_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_TRUETYPE_IDS_H <nl> - # include FT_DRIVER_H <nl> + # include < freetype / internal / ftcalc . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / ttnameid . h > <nl> + # include < freetype / ftdriver . h > <nl> <nl> # include " t1gload . h " <nl> # include " t1load . h " <nl> <nl> # include " t1afm . h " <nl> # endif <nl> <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> if ( error ) <nl> goto Exit ; <nl> <nl> - FT_TRACE2 ( ( " T1_Face_Init : % 08p ( index % d ) \ n " , <nl> - face , <nl> + FT_TRACE2 ( ( " T1_Face_Init : % p ( index % d ) \ n " , <nl> + ( void * ) face , <nl> face_index ) ) ; <nl> <nl> / * if we just wanted to check the format , leave successfully now * / <nl> mmm a / thirdparty / freetype / src / type1 / t1objs . h <nl> ppp b / thirdparty / freetype / src / type1 / t1objs . h <nl> <nl> <nl> <nl> # include < ft2build . h > <nl> - # include FT_INTERNAL_OBJECTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> # include FT_CONFIG_CONFIG_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / internal / t1types . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type1 / t1parse . c <nl> ppp b / thirdparty / freetype / src / type1 / t1parse . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> # include " t1parse . h " <nl> <nl> mmm a / thirdparty / freetype / src / type1 / t1parse . h <nl> ppp b / thirdparty / freetype / src / type1 / t1parse . h <nl> <nl> # define T1PARSE_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> - # include FT_INTERNAL_STREAM_H <nl> + # include < freetype / internal / t1types . h > <nl> + # include < freetype / internal / ftstream . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type1 / type1 . c <nl> ppp b / thirdparty / freetype / src / type1 / type1 . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " t1afm . c " <nl> # include " t1driver . c " <nl> mmm a / thirdparty / freetype / src / type42 / t42drivr . c <nl> ppp b / thirdparty / freetype / src / type42 / t42drivr . c <nl> <nl> # include " t42drivr . h " <nl> # include " t42objs . h " <nl> # include " t42error . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> + # include < freetype / internal / ftdebug . h > <nl> <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> - # include FT_SERVICE_GLYPH_DICT_H <nl> - # include FT_SERVICE_POSTSCRIPT_NAME_H <nl> - # include FT_SERVICE_POSTSCRIPT_INFO_H <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> + # include < freetype / internal / services / svgldict . h > <nl> + # include < freetype / internal / services / svpostnm . h > <nl> + # include < freetype / internal / services / svpsinfo . h > <nl> <nl> # undef FT_COMPONENT <nl> # define FT_COMPONENT t42 <nl> mmm a / thirdparty / freetype / src / type42 / t42drivr . h <nl> ppp b / thirdparty / freetype / src / type42 / t42drivr . h <nl> <nl> # define T42DRIVR_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type42 / t42error . h <nl> ppp b / thirdparty / freetype / src / type42 / t42error . h <nl> <nl> # ifndef T42ERROR_H_ <nl> # define T42ERROR_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX T42_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Type42 <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * T42ERROR_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / type42 / t42objs . c <nl> ppp b / thirdparty / freetype / src / type42 / t42objs . c <nl> <nl> # include " t42objs . h " <nl> # include " t42parse . h " <nl> # include " t42error . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_LIST_H <nl> - # include FT_TRUETYPE_IDS_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / ftlist . h > <nl> + # include < freetype / ttnameid . h > <nl> <nl> <nl> # undef FT_COMPONENT <nl> mmm a / thirdparty / freetype / src / type42 / t42objs . h <nl> ppp b / thirdparty / freetype / src / type42 / t42objs . h <nl> <nl> # ifndef T42OBJS_H_ <nl> # define T42OBJS_H_ <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_TYPE1_TABLES_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / t1tables . h > <nl> + # include < freetype / internal / t1types . h > <nl> # include " t42types . h " <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_INTERNAL_DRIVER_H <nl> - # include FT_SERVICE_POSTSCRIPT_CMAPS_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / internal / ftdrv . h > <nl> + # include < freetype / internal / services / svpscmap . h > <nl> + # include < freetype / internal / pshints . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type42 / t42parse . c <nl> ppp b / thirdparty / freetype / src / type42 / t42parse . c <nl> <nl> <nl> # include " t42parse . h " <nl> # include " t42error . h " <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> <nl> if ( loader - > num_glyphs > ( limit - parser - > root . cursor ) > > 2 ) <nl> { <nl> FT_TRACE0 ( ( " t42_parse_charstrings : adjusting number of glyphs " <nl> - " ( from % d to % d ) \ n " , <nl> + " ( from % d to % ld ) \ n " , <nl> loader - > num_glyphs , <nl> ( limit - parser - > root . cursor ) > > 2 ) ) ; <nl> loader - > num_glyphs = ( limit - parser - > root . cursor ) > > 2 ; <nl> mmm a / thirdparty / freetype / src / type42 / t42parse . h <nl> ppp b / thirdparty / freetype / src / type42 / t42parse . h <nl> <nl> <nl> <nl> # include " t42objs . h " <nl> - # include FT_INTERNAL_POSTSCRIPT_AUX_H <nl> + # include < freetype / internal / psaux . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type42 / t42types . h <nl> ppp b / thirdparty / freetype / src / type42 / t42types . h <nl> <nl> # define T42TYPES_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_FREETYPE_H <nl> - # include FT_TYPE1_TABLES_H <nl> - # include FT_INTERNAL_TYPE1_TYPES_H <nl> - # include FT_INTERNAL_POSTSCRIPT_HINTS_H <nl> + # include < freetype / freetype . h > <nl> + # include < freetype / t1tables . h > <nl> + # include < freetype / internal / t1types . h > <nl> + # include < freetype / internal / pshints . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl> mmm a / thirdparty / freetype / src / type42 / type42 . c <nl> ppp b / thirdparty / freetype / src / type42 / type42 . c <nl> <nl> <nl> <nl> # define FT_MAKE_OPTION_SINGLE_OBJECT <nl> - # include < ft2build . h > <nl> <nl> # include " t42drivr . c " <nl> # include " t42objs . c " <nl> mmm a / thirdparty / freetype / src / winfonts / fnterrs . h <nl> ppp b / thirdparty / freetype / src / winfonts / fnterrs . h <nl> <nl> # ifndef FNTERRS_H_ <nl> # define FNTERRS_H_ <nl> <nl> - # include FT_MODULE_ERRORS_H <nl> + # include < freetype / ftmoderr . h > <nl> <nl> # undef FTERRORS_H_ <nl> <nl> <nl> # define FT_ERR_PREFIX FNT_Err_ <nl> # define FT_ERR_BASE FT_Mod_Err_Winfonts <nl> <nl> - # include FT_ERRORS_H <nl> + # include < freetype / fterrors . h > <nl> <nl> # endif / * FNTERRS_H_ * / <nl> <nl> mmm a / thirdparty / freetype / src / winfonts / winfnt . c <nl> ppp b / thirdparty / freetype / src / winfonts / winfnt . c <nl> <nl> * / <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_WINFONTS_H <nl> - # include FT_INTERNAL_DEBUG_H <nl> - # include FT_INTERNAL_STREAM_H <nl> - # include FT_INTERNAL_OBJECTS_H <nl> - # include FT_TRUETYPE_IDS_H <nl> + # include < freetype / ftwinfnt . h > <nl> + # include < freetype / internal / ftdebug . h > <nl> + # include < freetype / internal / ftstream . h > <nl> + # include < freetype / internal / ftobjs . h > <nl> + # include < freetype / ttnameid . h > <nl> <nl> # include " winfnt . h " <nl> # include " fnterrs . h " <nl> - # include FT_SERVICE_WINFNT_H <nl> - # include FT_SERVICE_FONT_FORMAT_H <nl> + # include < freetype / internal / services / svwinfnt . h > <nl> + # include < freetype / internal / services / svfntfmt . h > <nl> <nl> / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> * <nl> mmm a / thirdparty / freetype / src / winfonts / winfnt . h <nl> ppp b / thirdparty / freetype / src / winfonts / winfnt . h <nl> <nl> # define WINFNT_H_ <nl> <nl> <nl> - # include < ft2build . h > <nl> - # include FT_WINFONTS_H <nl> - # include FT_INTERNAL_DRIVER_H <nl> + # include < freetype / ftwinfnt . h > <nl> + # include < freetype / internal / ftdrv . h > <nl> <nl> <nl> FT_BEGIN_HEADER <nl>
|
Merge pull request from volzhs / freetype - 2 . 10 . 3
|
godotengine/godot
|
a04db8eb11eaf6bcede821dbafbb25a2fe3e708f
|
2020-10-22T12:10:22Z
|
mmm a / Source / CNTK / BrainScript / CNTKCoreLib / CNTK . core . bs <nl> ppp b / Source / CNTK / BrainScript / CNTKCoreLib / CNTK . core . bs <nl> ConvolutionTransposeLayer { numOutputChannels , <nl> _PoolingLayer { poolKind , # " max " or " average " <nl> filterShape , # e . g . ( 3 : 3 ) <nl> stride = 1 , pad = false , <nl> - lowerPad = 0 , upperPad = 0 , ceilOutDim = false } = # TODO : support this <nl> + lowerPad = 0 , upperPad = 0 , ceilOutDim = false , includePad = false } = # TODO : support this <nl> { <nl> apply ( x ) = Pooling ( x , poolKind , filterShape , stride = stride , autoPadding = pad , lowerPad = lowerPad , upperPad = upperPad , ceilOutDim = ceilOutDim , includePad = includePad ) <nl> } . apply <nl> MaxPoolingLayer { filterShape , stride = 1 , pad = false , lowerPad = 0 , upperPad = 0 , ceilOutDim = false } = <nl> _PoolingLayer { " max " , filterShape , stride = stride , pad = pad , lowerPad = lowerPad , upperPad = upperPad , ceilOutDim = ceilOutDim , includePad = false } <nl> - AveragePoolingLayer { filterShape , stride = 1 , pad = false , lowerPad = 0 , upperPad = 0 , ceilOutDim = false } = <nl> + AveragePoolingLayer { filterShape , stride = 1 , pad = false , lowerPad = 0 , upperPad = 0 , ceilOutDim = false , includePad = false } = <nl> _PoolingLayer { " average " , filterShape , stride = stride , pad = pad , lowerPad = lowerPad , upperPad = upperPad , ceilOutDim = ceilOutDim , includePad = includePad } <nl> <nl> MaxUnpoolingLayer { filterShape , # e . g . ( 3 : 3 ) <nl>
|
fix avg - pooling - include - pad bug for BS script
|
microsoft/CNTK
|
cc0698077a0090e12c5bc0e649267520704b3184
|
2017-03-06T12:38:15Z
|
mmm a / arangod / Aql / ExecutionBlock . h <nl> ppp b / arangod / Aql / ExecutionBlock . h <nl> namespace triagens { <nl> return res ; <nl> } <nl> } <nl> + for ( auto it = _buffer . begin ( ) ; it ! = _buffer . end ( ) ; + + it ) { <nl> + delete * it ; <nl> + } <nl> return TRI_ERROR_NO_ERROR ; <nl> } <nl> <nl>
|
Fix a memory leak .
|
arangodb/arangodb
|
6e9b345634df36faae002c58099c1a4fe782a81d
|
2014-08-04T16:40:34Z
|
mmm a / src / ExtendedTableWidget . cpp <nl> ppp b / src / ExtendedTableWidget . cpp <nl> <nl> # include < QTextDocument > <nl> # include < QCompleter > <nl> # include < QComboBox > <nl> + # include < QShortcut > <nl> <nl> # include < limits > <nl> <nl> ExtendedTableWidget : : ExtendedTableWidget ( QWidget * parent ) : <nl> openPrintDialog ( ) ; <nl> } ) ; <nl> <nl> + / / Add spreadsheet shortcuts for selecting entire columns or entire rows . <nl> + QShortcut * selectColumnShortcut = new QShortcut ( QKeySequence ( " Ctrl + Space " ) , this ) ; <nl> + connect ( selectColumnShortcut , & QShortcut : : activated , [ this ] ( ) { <nl> + selectionModel ( ) - > select ( QItemSelection ( selectionModel ( ) - > selectedIndexes ( ) . constFirst ( ) , selectionModel ( ) - > selectedIndexes ( ) . constLast ( ) ) , QItemSelectionModel : : Select | QItemSelectionModel : : Columns ) ; <nl> + } ) ; <nl> + QShortcut * selectRowShortcut = new QShortcut ( QKeySequence ( " Shift + Space " ) , this ) ; <nl> + connect ( selectRowShortcut , & QShortcut : : activated , [ this ] ( ) { <nl> + selectionModel ( ) - > select ( QItemSelection ( selectionModel ( ) - > selectedIndexes ( ) . constFirst ( ) , selectionModel ( ) - > selectedIndexes ( ) . constLast ( ) ) , QItemSelectionModel : : Select | QItemSelectionModel : : Rows ) ; <nl> + } ) ; <nl> + <nl> # if QT_VERSION > = QT_VERSION_CHECK ( 5 , 12 , 0 ) & & QT_VERSION < QT_VERSION_CHECK ( 5 , 12 , 3 ) <nl> / / This work arounds QTBUG - 73721 and it is applied only for the affected version range . <nl> setWordWrap ( false ) ; <nl> mmm a / src / TableBrowser . cpp <nl> ppp b / src / TableBrowser . cpp <nl> TableBrowser : : TableBrowser ( QWidget * parent ) : <nl> popupHeaderMenu - > addAction ( ui - > actionShowRowidColumn ) ; <nl> popupHeaderMenu - > addAction ( ui - > actionHideColumns ) ; <nl> popupHeaderMenu - > addAction ( ui - > actionShowAllColumns ) ; <nl> + popupHeaderMenu - > addAction ( ui - > actionSelectColumn ) ; <nl> popupHeaderMenu - > addSeparator ( ) ; <nl> popupHeaderMenu - > addAction ( ui - > actionUnlockViewEditing ) ; <nl> popupHeaderMenu - > addAction ( ui - > actionBrowseTableEditDisplayFormat ) ; <nl> TableBrowser : : TableBrowser ( QWidget * parent ) : <nl> popupHeaderMenu - > addAction ( ui - > actionSetTableEncoding ) ; <nl> popupHeaderMenu - > addAction ( ui - > actionSetAllTablesEncoding ) ; <nl> <nl> + connect ( ui - > actionSelectColumn , & QAction : : triggered , [ this ] ( ) { <nl> + ui - > dataTable - > selectColumn ( ui - > actionBrowseTableEditDisplayFormat - > property ( " clicked_column " ) . toInt ( ) ) ; <nl> + } ) ; <nl> + <nl> / / Set up shortcuts <nl> QShortcut * dittoRecordShortcut = new QShortcut ( QKeySequence ( " Ctrl + \ " " ) , this ) ; <nl> connect ( dittoRecordShortcut , & QShortcut : : activated , [ this ] ( ) { <nl> mmm a / src / TableBrowser . ui <nl> ppp b / src / TableBrowser . ui <nl> <nl> < string > This button shows or hides the formatting toolbar of the Data Browser < / string > <nl> < / property > <nl> < / action > <nl> + < action name = " actionSelectColumn " > <nl> + < property name = " text " > <nl> + < string > Select column < / string > <nl> + < / property > <nl> + < property name = " shortcut " > <nl> + < string > Ctrl + Space < / string > <nl> + < / property > <nl> + < / action > <nl> < / widget > <nl> < customwidgets > <nl> < customwidget > <nl>
|
Easy way of selecting columns ( and rows )
|
sqlitebrowser/sqlitebrowser
|
01378367a63b28e5e1b1ea484db2a1a496f85ea8
|
2019-10-27T22:35:48Z
|
mmm a / code / sorting / merge_sort / merge_sort . cpp <nl> ppp b / code / sorting / merge_sort / merge_sort . cpp <nl> mergeSort ( _Random_Acccess_Iter begin , _Random_Acccess_Iter end , _Compare comp ) <nl> rightMin = leftMax = advance ( leftMin , i ) ; <nl> rightMax = advance ( leftMax , i ) ; <nl> <nl> - / / prevent overflow , if length is now 2 ^ n <nl> + / / prevent overflow , if length is not 2 ^ n <nl> if ( rightMax > end ) <nl> rightMax = end ; <nl> <nl>
|
fix typo
|
OpenGenus/cosmos
|
f988c052afb9b12ddea66c22df43ccdb09b79778
|
2017-12-01T09:30:17Z
|
mmm a / hphp / runtime / server / server - worker . h <nl> ppp b / hphp / runtime / server / server - worker . h <nl> struct ServerWorker <nl> bool error = true ; <nl> std : : string errorMsg ; <nl> <nl> - SCOPE_EXIT { m_handler - > teardownRequest ( ) ; } ; <nl> + SCOPE_EXIT { m_handler - > teardownRequest ( transport ) ; } ; <nl> <nl> try { <nl> m_handler - > setupRequest ( transport ) ; <nl> mmm a / hphp / runtime / server / server . h <nl> ppp b / hphp / runtime / server / server . h <nl> class RequestHandler { <nl> * Called before and after request - handling work . <nl> * / <nl> virtual void setupRequest ( Transport * transport ) { } <nl> - virtual void teardownRequest ( ) noexcept { } <nl> + virtual void teardownRequest ( Transport * transport ) noexcept { } <nl> <nl> / * * <nl> * Sub - class handles a request by implementing this function . <nl> class RequestHandler { <nl> void run ( Transport * transport ) { <nl> setupRequest ( transport ) ; <nl> handleRequest ( transport ) ; <nl> - teardownRequest ( ) ; <nl> + teardownRequest ( transport ) ; <nl> } <nl> <nl> int getDefaultTimeout ( ) const { return m_timeout ; } <nl>
|
pass transport to teardownRequest
|
facebook/hhvm
|
ffcb125b0e51f1658769268d3c74643e89c9e83d
|
2014-09-29T17:30:30Z
|
mmm a / modules / core / src / ocl . cpp <nl> ppp b / modules / core / src / ocl . cpp <nl> struct Queue : : Impl <nl> IMPLEMENT_REFCOUNTABLE ( ) ; <nl> <nl> cl_command_queue handle ; <nl> - bool initialized ; <nl> } ; <nl> <nl> Queue : : Queue ( ) <nl> mmm a / modules / nonfree / src / surf . hpp <nl> ppp b / modules / nonfree / src / surf . hpp <nl> class SURF_OCL <nl> bool detectKeypoints ( UMat & keypoints ) ; <nl> <nl> const SURF * params ; <nl> - int refcount ; <nl> <nl> / / ! max keypoints = min ( keypointsRatio * img . size ( ) . area ( ) , 65535 ) <nl> UMat sum , intBuffer ; <nl> mmm a / modules / objdetect / include / opencv2 / objdetect . hpp <nl> ppp b / modules / objdetect / include / opencv2 / objdetect . hpp <nl> struct CV_EXPORTS_W HOGDescriptor <nl> CV_WRAP HOGDescriptor ( ) : winSize ( 64 , 128 ) , blockSize ( 16 , 16 ) , blockStride ( 8 , 8 ) , <nl> cellSize ( 8 , 8 ) , nbins ( 9 ) , derivAperture ( 1 ) , winSigma ( - 1 ) , <nl> histogramNormType ( HOGDescriptor : : L2Hys ) , L2HysThreshold ( 0 . 2 ) , gammaCorrection ( true ) , <nl> - nlevels ( HOGDescriptor : : DEFAULT_NLEVELS ) <nl> + free_coef ( - 1 . f ) , nlevels ( HOGDescriptor : : DEFAULT_NLEVELS ) <nl> { } <nl> <nl> CV_WRAP HOGDescriptor ( Size _winSize , Size _blockSize , Size _blockStride , <nl> struct CV_EXPORTS_W HOGDescriptor <nl> : winSize ( _winSize ) , blockSize ( _blockSize ) , blockStride ( _blockStride ) , cellSize ( _cellSize ) , <nl> nbins ( _nbins ) , derivAperture ( _derivAperture ) , winSigma ( _winSigma ) , <nl> histogramNormType ( _histogramNormType ) , L2HysThreshold ( _L2HysThreshold ) , <nl> - gammaCorrection ( _gammaCorrection ) , nlevels ( _nlevels ) <nl> + gammaCorrection ( _gammaCorrection ) , free_coef ( - 1 . f ) , nlevels ( _nlevels ) <nl> { } <nl> <nl> CV_WRAP HOGDescriptor ( const String & filename ) <nl>
|
Merge pull request from apavlenko : fix_coverity_scan
|
opencv/opencv
|
8b16b8b6571c9ce6cbd26f80997632eb40dc9faa
|
2014-02-07T12:54:30Z
|
mmm a / tests / test_core . py <nl> ppp b / tests / test_core . py <nl> def test_math_hyperbolic ( self ) : <nl> def test_math_lgamma ( self ) : <nl> if self . emcc_args is None : return self . skip ( ' requires emcc ' ) <nl> if not self . is_emscripten_abi ( ) : return self . skip ( ' asmjs - unknown - emscripten needed for accurate math ' ) <nl> + if os . environ . get ( ' EMCC_FAST_COMPILER ' ) = = ' 0 ' : return self . skip ( ' fastcomp needed for proper handling of _signgam extern ' ) <nl> <nl> test_path = path_from_root ( ' tests ' , ' math ' , ' lgamma ' ) <nl> src , output = ( test_path + s for s in ( ' . in ' , ' . out ' ) ) <nl>
|
disable test_math_lgamma in non - fastcomp
|
emscripten-core/emscripten
|
3ae665914cdacbac687b6de6f4ad1d7119f318d7
|
2014-07-03T18:30:15Z
|
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> cocos2d - x - 3 . 6beta0 Apr . 14 2015 <nl> [ NEW ] Animate3D : added ` Animate3D : : setHighQuality ( ) ` to set animation quality <nl> <nl> [ FIX ] Audio : memory leak <nl> + [ FIX ] Particle3D : particles ' rotation affect particle system ' s rotation <nl> [ FIX ] Sprite3D : memory leak <nl> <nl> cocos2d - x - 3 . 5 Mar . 23 2015 <nl>
|
[ ci skip ] update CHANGELOG
|
cocos2d/cocos2d-x
|
7a369abeb593867a009201e25be707e1abba0e37
|
2015-04-03T23:13:59Z
|
mmm a / Makefile <nl> ppp b / Makefile <nl> SRCHEADERS_WESTMERE = src / westmere / bitmanipulation . h src / westmere / bitmask . h src / we <nl> SRCHEADERS_SRC = src / isadetection . h src / jsoncharutils . h src / simdprune_tables . h src / implementation . cpp src / stage1_find_marks . cpp src / stage2_build_tape . cpp src / document_parser_callbacks . h <nl> SRCHEADERS = $ ( SRCHEADERS_SRC ) $ ( SRCHEADERS_GENERIC ) $ ( SRCHEADERS_ARM64 ) $ ( SRCHEADERS_HASWELL ) $ ( SRCHEADERS_WESTMERE ) $ ( SRCHEADERS_FALLBACK ) <nl> <nl> - INCLUDEHEADERS = include / simdjson . h include / simdjson / common_defs . h include / simdjson / internal / jsonformatutils . h include / simdjson / jsonioutil . h include / simdjson / jsonparser . h include / simdjson / padded_string . h include / simdjson / inline / padded_string . h include / simdjson / document . h include / simdjson / inline / document . h include / simdjson / parsedjson_iterator . h include / simdjson / inline / parsedjson_iterator . h include / simdjson / document_stream . h include / simdjson / inline / document_stream . h include / simdjson / implementation . h include / simdjson / parsedjson . h include / simdjson / jsonstream . h include / simdjson / inline / jsonstream . h include / simdjson / portability . h include / simdjson / error . h include / simdjson / inline / error . h include / simdjson / simdjson . h include / simdjson / simdjson_version . h <nl> + INCLUDEHEADERS = include / simdjson . h include / simdjson / common_defs . h include / simdjson / internal / jsonformatutils . h include / simdjson / jsonioutil . h include / simdjson / jsonparser . h include / simdjson / padded_string . h include / simdjson / inline / padded_string . h include / simdjson / document . h include / simdjson / inline / document . h include / simdjson / parsedjson_iterator . h include / simdjson / inline / parsedjson_iterator . h include / simdjson / document_stream . h include / simdjson / inline / document_stream . h include / simdjson / implementation . h include / simdjson / parsedjson . h include / simdjson / portability . h include / simdjson / error . h include / simdjson / inline / error . h include / simdjson / simdjson . h include / simdjson / simdjson_version . h <nl> <nl> ifeq ( $ ( SIMDJSON_TEST_AMALGAMATED_HEADERS ) , 1 ) <nl> HEADERS = singleheader / simdjson . h <nl> mmm a / include / CMakeLists . txt <nl> ppp b / include / CMakeLists . txt <nl> set ( SIMDJSON_INCLUDE <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / inline / document_stream . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / inline / document . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / inline / error . h <nl> - $ { SIMDJSON_INCLUDE_DIR } / simdjson / inline / jsonstream . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / inline / padded_string . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / inline / parsedjson_iterator . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / internal / jsonformatutils . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / jsonioutil . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / jsonparser . h <nl> - $ { SIMDJSON_INCLUDE_DIR } / simdjson / jsonstream . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / padded_string . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / parsedjson . h <nl> $ { SIMDJSON_INCLUDE_DIR } / simdjson / parsedjson_iterator . h <nl> mmm a / include / simdjson . h <nl> ppp b / include / simdjson . h <nl> <nl> # include " simdjson / jsonparser . h " <nl> # include " simdjson / parsedjson . h " <nl> # include " simdjson / parsedjson_iterator . h " <nl> - # include " simdjson / jsonstream . h " <nl> <nl> / / Inline functions <nl> # include " simdjson / inline / document . h " <nl> # include " simdjson / inline / document_stream . h " <nl> # include " simdjson / inline / error . h " <nl> - # include " simdjson / inline / jsonstream . h " <nl> # include " simdjson / inline / padded_string . h " <nl> # include " simdjson / inline / parsedjson_iterator . h " <nl> <nl> mmm a / include / simdjson / document_stream . h <nl> ppp b / include / simdjson / document_stream . h <nl> <nl> <nl> namespace simdjson { <nl> <nl> - template < class string_container = padded_string > class JsonStream ; <nl> - <nl> / * * <nl> * A forward - only stream of documents . <nl> * <nl> class document : : stream { <nl> std : : thread stage_1_thread ; <nl> document : : parser parser_thread ; <nl> # endif <nl> - template < class string_container > friend class JsonStream ; <nl> friend class document : : parser ; <nl> } ; / / class document : : stream <nl> <nl> mmm a / include / simdjson / inline / document_stream . h <nl> ppp b / include / simdjson / inline / document_stream . h <nl> <nl> # ifndef SIMDJSON_INLINE_DOCUMENT_STREAM_H <nl> # define SIMDJSON_INLINE_DOCUMENT_STREAM_H <nl> <nl> - # include " simdjson / jsonstream . h " <nl> + # include " simdjson / document_stream . h " <nl> # include < algorithm > <nl> # include < limits > <nl> # include < stdexcept > <nl> deleted file mode 100644 <nl> index e0774a3ae . . 000000000 <nl> mmm a / include / simdjson / inline / jsonstream . h <nl> ppp / dev / null <nl> <nl> - / / TODO Remove this - - deprecated API and files <nl> - <nl> - # ifndef SIMDJSON_INLINE_JSONSTREAM_H <nl> - # define SIMDJSON_INLINE_JSONSTREAM_H <nl> - <nl> - # include " simdjson / jsonstream . h " <nl> - # include " simdjson / document . h " <nl> - # include " simdjson / document_stream . h " <nl> - <nl> - namespace simdjson { <nl> - <nl> - template < class string_container > <nl> - inline JsonStream < string_container > : : JsonStream ( const string_container & s , size_t _batch_size ) noexcept <nl> - : str ( s ) , batch_size ( _batch_size ) { <nl> - } <nl> - <nl> - template < class string_container > <nl> - inline JsonStream < string_container > : : ~ JsonStream ( ) noexcept { <nl> - if ( stream ) { delete stream ; } <nl> - } <nl> - <nl> - template < class string_container > <nl> - inline int JsonStream < string_container > : : json_parse ( document : : parser & parser ) noexcept { <nl> - if ( unlikely ( stream = = nullptr ) ) { <nl> - stream = new document : : stream ( parser , reinterpret_cast < const uint8_t * > ( str . data ( ) ) , str . length ( ) , batch_size ) ; <nl> - } else { <nl> - if ( & parser ! = & stream - > parser ) { return stream - > error = TAPE_ERROR ; } <nl> - stream - > error = stream - > json_parse ( ) ; <nl> - } <nl> - return stream - > error ; <nl> - } <nl> - <nl> - } / / namespace simdjson <nl> - <nl> - # endif / / SIMDJSON_INLINE_JSONSTREAM_H <nl> deleted file mode 100644 <nl> index be98959dc . . 000000000 <nl> mmm a / include / simdjson / jsonstream . h <nl> ppp / dev / null <nl> <nl> - / / TODO Remove this - - deprecated API and files <nl> - <nl> - # ifndef SIMDJSON_JSONSTREAM_H <nl> - # define SIMDJSON_JSONSTREAM_H <nl> - <nl> - # include " simdjson / document_stream . h " <nl> - # include " simdjson / padded_string . h " <nl> - <nl> - namespace simdjson { <nl> - <nl> - / * * <nl> - * @ deprecated use document : : stream instead . <nl> - * <nl> - * The main motivation for this piece of software is to achieve maximum speed and offer <nl> - * good quality of life while parsing files containing multiple JSON documents . <nl> - * <nl> - * Since we want to offer flexibility and not restrict ourselves to a specific file <nl> - * format , we support any file that contains any valid JSON documents separated by one <nl> - * or more character that is considered a whitespace by the JSON spec . <nl> - * Namely : space , nothing , linefeed , carriage return , horizontal tab . <nl> - * Anything that is not whitespace will be parsed as a JSON document and could lead <nl> - * to failure . <nl> - * <nl> - * To offer maximum parsing speed , our implementation processes the data inside the <nl> - * buffer by batches and their size is defined by the parameter " batch_size " . <nl> - * By loading data in batches , we can optimize the time spent allocating data in the <nl> - * parser and can also open the possibility of multi - threading . <nl> - * The batch_size must be at least as large as the biggest document in the file , but <nl> - * not too large in order to submerge the chached memory . We found that 1MB is <nl> - * somewhat a sweet spot for now . Eventually , this batch_size could be fully <nl> - * automated and be optimal at all times . <nl> - * <nl> - * The template parameter ( string_container ) must <nl> - * support the data ( ) and size ( ) methods , returning a pointer <nl> - * to a char * and to the number of bytes respectively . <nl> - * The simdjson parser may read up to SIMDJSON_PADDING bytes beyond the end <nl> - * of the string , so if you do not use a padded_string container , <nl> - * you have the responsibility to overallocate . If you fail to <nl> - * do so , your software may crash if you cross a page boundary , <nl> - * and you should expect memory checkers to object . <nl> - * Most users should use a simdjson : : padded_string . <nl> - * / <nl> - template < class string_container > class JsonStream { <nl> - public : <nl> - / * Create a JsonStream object that can be used to parse sequentially the valid <nl> - * JSON documents found in the buffer " buf " . <nl> - * <nl> - * The batch_size must be at least as large as the biggest document in the <nl> - * file , but <nl> - * not too large to submerge the cached memory . We found that 1MB is <nl> - * somewhat a sweet spot for now . <nl> - * <nl> - * The user is expected to call the following json_parse method to parse the <nl> - * next <nl> - * valid JSON document found in the buffer . This method can and is expected <nl> - * to be <nl> - * called in a loop . <nl> - * <nl> - * Various methods are offered to keep track of the status , like <nl> - * get_current_buffer_loc , <nl> - * get_n_parsed_docs , get_n_bytes_parsed , etc . <nl> - * <nl> - * * / <nl> - JsonStream ( const string_container & s , size_t _batch_size = 1000000 ) noexcept ; <nl> - <nl> - ~ JsonStream ( ) noexcept ; <nl> - <nl> - / * Parse the next document found in the buffer previously given to JsonStream . <nl> - <nl> - * The content should be a valid JSON document encoded as UTF - 8 . If there is a <nl> - * UTF - 8 BOM , the caller is responsible for omitting it , UTF - 8 BOM are <nl> - * discouraged . <nl> - * <nl> - * You do NOT need to pre - allocate a parser . This function takes care of <nl> - * pre - allocating a capacity defined by the batch_size defined when creating <nl> - the <nl> - * JsonStream object . <nl> - * <nl> - * The function returns simdjson : : SUCCESS_AND_HAS_MORE ( an integer = 1 ) in <nl> - case <nl> - * of success and indicates that the buffer still contains more data to be <nl> - parsed , <nl> - * meaning this function can be called again to return the next JSON document <nl> - * after this one . <nl> - * <nl> - * The function returns simdjson : : SUCCESS ( as integer = 0 ) in case of success <nl> - * and indicates that the buffer has successfully been parsed to the end . <nl> - * Every document it contained has been parsed without error . <nl> - * <nl> - * The function returns an error code from simdjson / simdjson . h in case of <nl> - failure <nl> - * such as simdjson : : CAPACITY , simdjson : : MEMALLOC , simdjson : : DEPTH_ERROR and <nl> - so forth ; <nl> - * the simdjson : : error_message function converts these error codes into a <nl> - * string ) . <nl> - * <nl> - * You can also check validity by calling parser . is_valid ( ) . The same parser <nl> - can <nl> - * and should be reused for the other documents in the buffer . * / <nl> - int json_parse ( document : : parser & parser ) noexcept ; <nl> - <nl> - / * Returns the location ( index ) of where the next document should be in the <nl> - * buffer . <nl> - * Can be used for debugging , it tells the user the position of the end of the <nl> - * last <nl> - * valid JSON document parsed * / <nl> - inline size_t get_current_buffer_loc ( ) const noexcept { return stream ? stream - > current_buffer_loc : 0 ; } <nl> - <nl> - / * Returns the total amount of complete documents parsed by the JsonStream , <nl> - * in the current buffer , at the given time . * / <nl> - inline size_t get_n_parsed_docs ( ) const noexcept { return stream ? stream - > n_parsed_docs : 0 ; } <nl> - <nl> - / * Returns the total amount of data ( in bytes ) parsed by the JsonStream , <nl> - * in the current buffer , at the given time . * / <nl> - inline size_t get_n_bytes_parsed ( ) const noexcept { return stream ? stream - > n_bytes_parsed : 0 ; } <nl> - <nl> - private : <nl> - const string_container & str ; <nl> - const size_t batch_size ; <nl> - document : : stream * stream { nullptr } ; <nl> - } ; / / end of class JsonStream <nl> - <nl> - } / / end of namespace simdjson <nl> - <nl> - # endif / / SIMDJSON_JSONSTREAM_H <nl> mmm a / tests / basictests . cpp <nl> ppp b / tests / basictests . cpp <nl> namespace document_stream_tests { <nl> return true ; <nl> } <nl> <nl> - / / returns true if successful <nl> - bool JsonStream_utf8_test ( ) { <nl> - std : : cout < < " Running " < < __func__ < < std : : endl ; <nl> - fflush ( NULL ) ; <nl> - const size_t n_records = 10000 ; <nl> - std : : string data ; <nl> - char buf [ 1024 ] ; <nl> - for ( size_t i = 0 ; i < n_records ; + + i ) { <nl> - auto n = sprintf ( buf , <nl> - " { \ " id \ " : % zu , \ " name \ " : \ " name % zu \ " , \ " gender \ " : \ " % s \ " , " <nl> - " \ " été \ " : { \ " id \ " : % zu , \ " name \ " : \ " éventail % zu \ " } } " , <nl> - i , i , ( i % 2 ) ? " ⺃ " : " ⺕ " , i % 10 , i % 10 ) ; <nl> - data + = std : : string ( buf , n ) ; <nl> - } <nl> - const size_t batch_size = 1000 ; <nl> - printf ( " . " ) ; <nl> - fflush ( NULL ) ; <nl> - simdjson : : padded_string str ( data ) ; <nl> - simdjson : : JsonStream < simdjson : : padded_string > js { str , batch_size } ; <nl> - int parse_res = simdjson : : SUCCESS_AND_HAS_MORE ; <nl> - size_t count = 0 ; <nl> - simdjson : : ParsedJson pj ; <nl> - while ( parse_res = = simdjson : : SUCCESS_AND_HAS_MORE ) { <nl> - parse_res = js . json_parse ( pj ) ; <nl> - if ( parse_res ! = simdjson : : SUCCESS & & parse_res ! = simdjson : : SUCCESS_AND_HAS_MORE ) { <nl> - break ; <nl> - } <nl> - simdjson : : ParsedJson : : Iterator iter ( pj ) ; <nl> - if ( ! iter . is_object ( ) ) { <nl> - printf ( " Root should be object \ n " ) ; <nl> - return false ; <nl> - } <nl> - if ( ! iter . down ( ) ) { <nl> - printf ( " Root should not be emtpy \ n " ) ; <nl> - return false ; <nl> - } <nl> - if ( ! iter . is_string ( ) ) { <nl> - printf ( " Object should start with string key \ n " ) ; <nl> - return false ; <nl> - } <nl> - if ( strcmp ( iter . get_string ( ) , " id " ) ! = 0 ) { <nl> - printf ( " There should a single key , id . \ n " ) ; <nl> - return false ; <nl> - } <nl> - iter . move_to_value ( ) ; <nl> - if ( ! iter . is_integer ( ) ) { <nl> - printf ( " Value of image should be integer \ n " ) ; <nl> - return false ; <nl> - } <nl> - int64_t keyid = iter . get_integer ( ) ; <nl> - if ( keyid ! = ( int64_t ) count ) { <nl> - printf ( " key does not match % d , expected % d \ n " , ( int ) keyid , ( int ) count ) ; <nl> - return false ; <nl> - } <nl> - count + + ; <nl> - } <nl> - if ( count ! = n_records ) { <nl> - printf ( " Something is wrong in JsonStream_utf8_test at window size = % zu . \ n " , batch_size ) ; <nl> - return false ; <nl> - } <nl> - printf ( " ok \ n " ) ; <nl> - return true ; <nl> - } <nl> - <nl> - / / returns true if successful <nl> - bool JsonStream_test ( ) { <nl> - std : : cout < < " Running " < < __func__ < < std : : endl ; <nl> - fflush ( NULL ) ; <nl> - const size_t n_records = 10000 ; <nl> - std : : string data ; <nl> - char buf [ 1024 ] ; <nl> - for ( size_t i = 0 ; i < n_records ; + + i ) { <nl> - auto n = sprintf ( buf , <nl> - " { \ " id \ " : % zu , \ " name \ " : \ " name % zu \ " , \ " gender \ " : \ " % s \ " , " <nl> - " \ " ete \ " : { \ " id \ " : % zu , \ " name \ " : \ " eventail % zu \ " } } " , <nl> - i , i , ( i % 2 ) ? " homme " : " femme " , i % 10 , i % 10 ) ; <nl> - data + = std : : string ( buf , n ) ; <nl> - } <nl> - const size_t batch_size = 1000 ; <nl> - printf ( " . " ) ; <nl> - fflush ( NULL ) ; <nl> - simdjson : : padded_string str ( data ) ; <nl> - simdjson : : JsonStream < simdjson : : padded_string > js { str , batch_size } ; <nl> - int parse_res = simdjson : : SUCCESS_AND_HAS_MORE ; <nl> - size_t count = 0 ; <nl> - simdjson : : ParsedJson pj ; <nl> - while ( parse_res = = simdjson : : SUCCESS_AND_HAS_MORE ) { <nl> - parse_res = js . json_parse ( pj ) ; <nl> - if ( parse_res ! = simdjson : : SUCCESS & & parse_res ! = simdjson : : SUCCESS_AND_HAS_MORE ) { <nl> - break ; <nl> - } <nl> - simdjson : : ParsedJson : : Iterator iter ( pj ) ; <nl> - if ( ! iter . is_object ( ) ) { <nl> - printf ( " Root should be object \ n " ) ; <nl> - return false ; <nl> - } <nl> - if ( ! iter . down ( ) ) { <nl> - printf ( " Root should not be emtpy \ n " ) ; <nl> - return false ; <nl> - } <nl> - if ( ! iter . is_string ( ) ) { <nl> - printf ( " Object should start with string key \ n " ) ; <nl> - return false ; <nl> - } <nl> - if ( strcmp ( iter . get_string ( ) , " id " ) ! = 0 ) { <nl> - printf ( " There should a single key , id . \ n " ) ; <nl> - return false ; <nl> - } <nl> - iter . move_to_value ( ) ; <nl> - if ( ! iter . is_integer ( ) ) { <nl> - printf ( " Value of image should be integer \ n " ) ; <nl> - return false ; <nl> - } <nl> - int64_t keyid = iter . get_integer ( ) ; <nl> - if ( keyid ! = ( int64_t ) count ) { <nl> - printf ( " key does not match % d , expected % d \ n " , ( int ) keyid , ( int ) count ) ; <nl> - return false ; <nl> - } <nl> - count + + ; <nl> - } <nl> - if ( count ! = n_records ) { <nl> - printf ( " Something is wrong in JsonStream_test at window size = % zu . \ n " , batch_size ) ; <nl> - return false ; <nl> - } <nl> - printf ( " ok \ n " ) ; <nl> - return true ; <nl> - } <nl> - <nl> / / returns true if successful <nl> bool document_stream_test ( ) { <nl> std : : cout < < " Running " < < __func__ < < std : : endl ; <nl> namespace document_stream_tests { <nl> <nl> bool run ( ) { <nl> return document_stream_test ( ) & & <nl> - document_stream_utf8_test ( ) & & <nl> - JsonStream_test ( ) & & <nl> - JsonStream_utf8_test ( ) ; <nl> + document_stream_utf8_test ( ) ; <nl> } <nl> } <nl> <nl>
|
Remove JsonStream . Use parse_many ( ) instead .
|
simdjson/simdjson
|
5aec2671eaf95847865d9259fe68f4595aa666c3
|
2020-03-26T16:25:07Z
|
mmm a / tensorflow / python / framework / random_seed . py <nl> ppp b / tensorflow / python / framework / random_seed . py <nl> <nl> DEFAULT_GRAPH_SEED = 87654321 <nl> _MAXINT32 = 2 * * 31 - 1 <nl> <nl> + <nl> def _truncate_seed ( seed ) : <nl> - return seed % _MAXINT32 # truncate to fit into 32 - bit integer <nl> + return seed % _MAXINT32 # Truncate to fit into 32 - bit integer <nl> <nl> <nl> def get_seed ( op_seed ) : <nl> def get_seed ( op_seed ) : <nl> " " " <nl> graph_seed = ops . get_default_graph ( ) . seed <nl> if graph_seed is not None : <nl> - if op_seed is not None : <nl> - return _truncate_seed ( graph_seed ) , _truncate_seed ( op_seed ) <nl> - else : <nl> - return _truncate_seed ( graph_seed ) , _truncate_seed ( ops . get_default_graph ( ) . _last_id ) <nl> + if op_seed is None : <nl> + # pylint : disable = protected - access <nl> + op_seed = ops . get_default_graph ( ) . _last_id <nl> + seeds = _truncate_seed ( graph_seed ) , _truncate_seed ( op_seed ) <nl> else : <nl> if op_seed is not None : <nl> - return _truncate_seed ( DEFAULT_GRAPH_SEED ) , _truncate_seed ( op_seed ) <nl> + seeds = DEFAULT_GRAPH_SEED , _truncate_seed ( op_seed ) <nl> else : <nl> - return None , None <nl> + seeds = None , None <nl> + # Avoid ( 0 , 0 ) as the C + + ops interpret it as nondeterminism , which would <nl> + # be unexpected since Python docs say nondeterminism is ( None , None ) . <nl> + if seeds = = ( 0 , 0 ) : <nl> + return ( 0 , _MAXINT32 ) <nl> + return seeds <nl> <nl> <nl> def set_random_seed ( seed ) : <nl> mmm a / tensorflow / python / framework / random_seed_test . py <nl> ppp b / tensorflow / python / framework / random_seed_test . py <nl> def testRandomSeed ( self ) : <nl> ( ( None , 1 ) , ( random_seed . DEFAULT_GRAPH_SEED , 1 ) ) , <nl> ( ( 1 , None ) , ( 1 , 0 ) ) , # 0 will be the default_graph . _lastid . <nl> ( ( 1 , 1 ) , ( 1 , 1 ) ) , <nl> + ( ( 0 , 0 ) , ( 0 , 2 * * 31 - 1 ) ) , # Avoid nondeterministic ( 0 , 0 ) output <nl> + ( ( 2 * * 31 - 1 , 0 ) , ( 0 , 2 * * 31 - 1 ) ) , # Don ' t wrap to ( 0 , 0 ) either <nl> + ( ( 0 , 2 * * 31 - 1 ) , ( 0 , 2 * * 31 - 1 ) ) , # Wrapping for the other argument <nl> ] <nl> for tc in test_cases : <nl> tinput , toutput = tc [ 0 ] , tc [ 1 ] <nl>
|
Fix tf . set_random_seed ( 0 ) to be deterministic for the first op
|
tensorflow/tensorflow
|
e9786df5e89f0345b2eb32d688c7be31c5259ba0
|
2017-02-23T23:11:52Z
|
mmm a / hphp / hack / src / format / format_hack . ml <nl> ppp b / hphp / hack / src / format / format_hack . ml <nl> let rec skip_spaces env = <nl> | Tspace - > skip_spaces env <nl> | _ - > back env <nl> <nl> + let rec skip_spaces_and_nl env = <nl> + match token env with <nl> + | Teof - > ( ) <nl> + | Tspace | Tnewline - > skip_spaces_and_nl env <nl> + | _ - > back env <nl> + <nl> let rec comment env = <nl> right_n 1 env comment_loop <nl> <nl> and xhp_single env = <nl> | Tslash - > seq env [ space ; last_token ; expect_xhp " > " ] <nl> | _ - > <nl> back env ; <nl> - seq env [ expect_xhp " > " ; xhp_body ; xhp_close_tag ] ; <nl> + seq env [ expect_xhp " > " ; skip_spaces_and_nl ; xhp_body ] ; <nl> + env . spaces : = 0 ; <nl> + xhp_close_tag env ; <nl> end <nl> <nl> and xhp_multi env = <nl> and xhp_multi env = <nl> back env ; <nl> expect_xhp " > " env ; <nl> newline env ; <nl> + skip_spaces_and_nl env ; <nl> margin_set margin_pos env begin fun env - > <nl> xhp_body env ; <nl> end ; <nl> and xhp_attribute_value env = wrap_xhp env begin function <nl> back env <nl> end <nl> <nl> - and xhp_space_after_Trcb = function <nl> - | Trp | Trcb | Trb | Tsc | Tcolon | Tcomma <nl> - | Tpercent | Tlcb | Tdot | Tem | Tqm | Tunderscore - > false <nl> - | _ - > false <nl> - <nl> + ( * It seems like whitespace is significant in XHP , but only insofar as it acts <nl> + * as a separator of non - whitespace characters . That is , consecutive whitespace <nl> + * will be rendered as a single space at runtime . Thus the handling of xhp_body <nl> + * has to be slightly different from the rest of the syntax , which does not <nl> + * treat whitespace as significant . In particular , we output consecutive <nl> + * whitespace here as a single space , unless we have just wrapped a line , in <nl> + * which case we output the necessary number of spaces required by the <nl> + * indentation level . * ) <nl> and xhp_body env = <nl> let k = xhp_body in <nl> - let last = ! ( env . last_token ) in <nl> match xhp_token env with <nl> | Teof - > ( ) <nl> - | Tnewline - > <nl> - newline env ; <nl> - k env <nl> - | Tspace - > <nl> + | Tnewline | Tspace - > <nl> + if ! ( env . last ) < > Newline then space env ; <nl> k env <nl> | Topen_xhp_comment - > <nl> last_token env ; <nl> xhp_comment env ; <nl> k env <nl> | Tlt when is_xhp env - > <nl> - last_token env ; <nl> - xhp env ; <nl> + Try . one_line env <nl> + ( fun env - > last_token env ; xhp_single env ) <nl> + ( fun env - > newline env ; last_token env ; xhp env ) ; <nl> k env ; <nl> | Tlt - > <nl> back env <nl> | Tlcb - > <nl> Try . one_line env <nl> begin fun env - > <nl> - if last = Tspace & & ! ( env . last ) < > Newline <nl> - then space env ; <nl> last_token env ; <nl> expr env ; <nl> expect_xhp " } " env ; <nl> and xhp_body env = <nl> end ; <nl> k env <nl> | x - > <nl> - let add_space = <nl> - if last = Trcb <nl> - then xhp_space_after_Trcb x <nl> - else true <nl> - in <nl> let pos = ! ( env . char_pos ) in <nl> let text = xhp_text env ( Buffer . create 256 ) x in <nl> if pos + String . length text > = env . char_size <nl> - then newline env <nl> - else if ! ( env . last ) = Newline <nl> - then ( ) <nl> - else if add_space <nl> - then space env ; <nl> + then newline env ; <nl> out text { env with report_fit = false } ; <nl> env . last : = Text ; <nl> k env <nl> and xhp_text env buf = function <nl> Buffer . add_string buf ! ( env . last_out ) ; <nl> xhp_text env buf ( xhp_token env ) <nl> <nl> - and xhp_comment env = <nl> + and xhp_comment env = Try . one_line env xhp_comment_single xhp_comment_multi <nl> + <nl> + and xhp_comment_single env = <nl> + seq env [ xhp_comment_body ; expect_xhp " - - > " ] <nl> + <nl> + and xhp_comment_multi env = <nl> newline env ; <nl> right env xhp_comment_body ; <nl> newline env ; <nl> and xhp_comment_body env = <nl> match xhp_token env with <nl> | Teof - > ( ) <nl> | Tnewline | Tspace - > <nl> + if ! ( env . last ) < > Newline then space env ; <nl> xhp_comment_body env <nl> | Tclose_xhp_comment - > <nl> back env <nl> and xhp_comment_body env = <nl> let pos = ! ( env . char_pos ) in <nl> let text = xhp_text env ( Buffer . create 256 ) x in <nl> if pos + String . length text > = env . char_size <nl> - then newline env <nl> - else if ! ( env . last ) = Newline <nl> - then ( ) <nl> - else space env ; <nl> + then newline env ; <nl> out text env ; <nl> env . last : = Text ; <nl> xhp_comment_body env <nl> mmm a / hphp / hack / test / format / xhp . php <nl> ppp b / hphp / hack / test / format / xhp . php <nl> function i ( ) { <nl> } <nl> <nl> function j ( ) { <nl> - / / it would be nice to squeeze this into one line , too <nl> return <nl> < a > <nl> < / a > ; <nl> function k ( ) { <nl> function m ( ) { <nl> return < b > < a href = " aaaaaaaaaaaaaaaaaaaaaaaaaa " asdf = " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " / > < a href = " a " / > < / b > ; <nl> } <nl> + <nl> + function n ( ) { <nl> + return < a > 1 1 1 < / a > ; <nl> + } <nl> + <nl> + function o ( ) { <nl> + return < a > <nl> + 1 1 1 <nl> + < / a > ; <nl> + } <nl> + <nl> + function p ( ) { <nl> + return < aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa href = " a " href2 = " a " href3 = " a " href4 = " a " > 1 1 1 < / aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa > ; <nl> + } <nl> + <nl> + function q ( ) { <nl> + return < aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa href = " a " href2 = " a " href3 = " a " href4 = " a " > <nl> + 1 1 1 <nl> + < / aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa > ; <nl> + } <nl> + <nl> + function r ( ) { <nl> + return < a > < ! - - this is a very long comment lorem ipsum ipsum ipsum ipsum ipsum ipsum - - > < / a > ; <nl> + } <nl> + <nl> + function s ( ) { <nl> + return < a > < ! - - this is a short comment - - > < / a > ; <nl> + } <nl> + <nl> + function t ( ) { <nl> + return < a > < a href = " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " > 1 < / a > < a href = " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " > 1 < / a > < / a > ; <nl> + } <nl> mmm a / hphp / hack / test / format / xhp . php . exp <nl> ppp b / hphp / hack / test / format / xhp . php . exp <nl> function i ( ) { <nl> } <nl> <nl> function j ( ) { <nl> - / / it would be nice to squeeze this into one line , too <nl> - return <nl> - < a > <nl> - < / a > ; <nl> + return < a > < / a > ; <nl> } <nl> <nl> function k ( ) { <nl> function m ( ) { <nl> < a href = " a " / > <nl> < / b > ; <nl> } <nl> + <nl> + function n ( ) { <nl> + return < a > 1 1 1 < / a > ; <nl> + } <nl> + <nl> + function o ( ) { <nl> + return < a > 1 1 1 < / a > ; <nl> + } <nl> + <nl> + function p ( ) { <nl> + return <nl> + < aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <nl> + href = " a " <nl> + href2 = " a " <nl> + href3 = " a " <nl> + href4 = " a " > <nl> + 1 1 1 <nl> + < / aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa > ; <nl> + } <nl> + <nl> + function q ( ) { <nl> + return <nl> + < aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <nl> + href = " a " <nl> + href2 = " a " <nl> + href3 = " a " <nl> + href4 = " a " > <nl> + 1 1 1 <nl> + < / aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa > ; <nl> + } <nl> + <nl> + function r ( ) { <nl> + return <nl> + < a > <nl> + < ! - - <nl> + this is a very long comment lorem ipsum ipsum ipsum ipsum ipsum ipsum <nl> + - - > <nl> + < / a > ; <nl> + } <nl> + <nl> + function s ( ) { <nl> + return < a > < ! - - this is a short comment - - > < / a > ; <nl> + } <nl> + <nl> + function t ( ) { <nl> + return <nl> + < a > <nl> + < a href = " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " > 1 < / a > <nl> + < a href = " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa " > 1 < / a > <nl> + < / a > ; <nl> + } <nl> mmm a / hphp / hack / test / typecheck / backtick_xhp . php <nl> ppp b / hphp / hack / test / typecheck / backtick_xhp . php <nl> <nl> * <nl> * / <nl> <nl> - <nl> - final class : ui : link { <nl> - <nl> - } <nl> + final class : ui : link { } <nl> <nl> class Bloo { <nl> public function mybloo ( ) : void { <nl> deleted file mode 100644 <nl> index e69de29bb2d . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / dollar_xhp . php <nl> ppp b / hphp / hack / test / typecheck / dollar_xhp . php <nl> <nl> * <nl> * / <nl> <nl> - <nl> class Bloo { <nl> public function mybloo ( ) : void { <nl> $ x = < div > $ < / div > ; <nl> deleted file mode 100644 <nl> index e69de29bb2d . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / functional_xhp . php <nl> ppp b / hphp / hack / test / typecheck / functional_xhp . php <nl> <nl> * <nl> * / <nl> <nl> - <nl> - class Blah { <nl> - } <nl> + class Blah { } <nl> <nl> class : x : xx extends Blah { <nl> - attribute <nl> - Map < string , int > k ; <nl> + attribute Map < string , int > k ; <nl> } <nl> <nl> - class : x : xy { <nl> - } <nl> + class : x : xy { } <nl> <nl> - class A { <nl> - } <nl> + class A { } <nl> <nl> function test ( ) : void { <nl> - $ x = < x : xx k = { Map { } } > < / x : xx > ; <nl> + $ x = < x : xx k = { Map { } } > < / x : xx > ; <nl> } <nl> deleted file mode 100644 <nl> index e69de29bb2d . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / string_expressions12 . php <nl> ppp b / hphp / hack / test / typecheck / string_expressions12 . php <nl> <nl> <nl> class Dude { <nl> private function blah ( ) : : fbt { <nl> - return <nl> - < fbt project = " blah " > <nl> - Some Text <nl> - < / fbt > ; <nl> + return < fbt project = " blah " > Some Text < / fbt > ; <nl> } <nl> } <nl> <nl> mmm a / hphp / hack / test / typecheck / typing_ok_xhp . php <nl> ppp b / hphp / hack / test / typecheck / typing_ok_xhp . php <nl> <nl> * <nl> * / <nl> <nl> - class A { <nl> - } <nl> + class A { } <nl> <nl> - class : x : dumb { <nl> - } <nl> + class : x : dumb { } <nl> <nl> function foo ( mixed $ x ) : void { <nl> / / Anything goes in XHP <nl> - $ x = < x : dumb > { 0 } { ' hello ' } { $ x } { new A ( ) } < / x : dumb > ; <nl> + $ x = < x : dumb > { 0 } { ' hello ' } { $ x } { new A ( ) } < / x : dumb > ; <nl> } <nl> deleted file mode 100644 <nl> index e69de29bb2d . . 00000000000 <nl> mmm a / hphp / hack / test / typecheck / xhpchild . php <nl> ppp b / hphp / hack / test / typecheck / xhpchild . php <nl> <nl> <nl> class : x implements XHPChild { } <nl> <nl> - function f1 ( XHPChild $ x ) : void { <nl> - } <nl> + function f1 ( XHPChild $ x ) : void { } <nl> <nl> function f2 ( ) : void { <nl> f1 ( " hello " ) ; <nl> deleted file mode 100644 <nl> index e69de29bb2d . . 00000000000 <nl>
|
Format : Improve handling of XHP bodies
|
facebook/hhvm
|
112c5708e530127d4e4cef0aeabc80abf7e9c1fd
|
2015-05-15T19:00:41Z
|
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> <nl> v2 . 3 . 0 ( XXXX - XX - XX ) <nl> mmmmmmmmmmmmmmmmmm - <nl> <nl> + * front - end : added function to move documents to another collection <nl> + <nl> * front - end : added sort - by attribute to the documents filter <nl> <nl> * front - end : added sorting feature to database , graph management and user management view . <nl> v2 . 3 . 0 ( XXXX - XX - XX ) <nl> * front - end : the user - set filter of a collection is now stored until the user navigates to <nl> another collection . <nl> <nl> - * front - end : fetching and filtering of documents and query operations are now handled with <nl> - asynchronous ajax calls . <nl> + * front - end : fetching and filtering of documents , statistics , and query operations are now <nl> + handled with asynchronous ajax calls . <nl> <nl> * front - end : added process indicator if the front - end is waiting for a server operation . <nl> <nl> mmm a / js / apps / system / aardvark / frontend / js / collections / arangoDocuments . js <nl> ppp b / js / apps / system / aardvark / frontend / js / collections / arangoDocuments . js <nl> <nl> this . filters = [ ] ; <nl> } , <nl> <nl> + moveDocument : function ( key , fromCollection , toCollection , callback ) { <nl> + var querySave , queryRemove , queryObj , bindVars = { <nl> + " @ collection " : fromCollection , <nl> + " filterid " : key <nl> + } , queryObj1 , queryObj2 ; <nl> + <nl> + querySave = " FOR x IN @ @ collection " ; <nl> + querySave + = " FILTER x . _key = = @ filterid " ; <nl> + querySave + = " INSERT x IN " ; <nl> + querySave + = toCollection ; <nl> + <nl> + queryRemove = " FOR x in @ @ collection " ; <nl> + queryRemove + = " FILTER x . _key = = @ filterid " ; <nl> + queryRemove + = " REMOVE x IN @ @ collection " ; <nl> + <nl> + queryObj1 = { <nl> + query : querySave , <nl> + bindVars : bindVars <nl> + } ; <nl> + <nl> + queryObj2 = { <nl> + query : queryRemove , <nl> + bindVars : bindVars <nl> + } ; <nl> + <nl> + window . progressView . show ( ) ; <nl> + / / first insert docs in toCollection <nl> + $ . ajax ( { <nl> + cache : false , <nl> + type : ' POST ' , <nl> + async : true , <nl> + url : ' / _api / cursor ' , <nl> + data : JSON . stringify ( queryObj1 ) , <nl> + contentType : " application / json " , <nl> + success : function ( data ) { <nl> + / / if successful remove unwanted docs <nl> + $ . ajax ( { <nl> + cache : false , <nl> + type : ' POST ' , <nl> + async : true , <nl> + url : ' / _api / cursor ' , <nl> + data : JSON . stringify ( queryObj2 ) , <nl> + contentType : " application / json " , <nl> + success : function ( data ) { <nl> + if ( callback ) { <nl> + callback ( ) ; <nl> + } <nl> + window . progressView . hide ( ) ; <nl> + } , <nl> + error : function ( data ) { <nl> + window . progressView . hide ( ) ; <nl> + arangoHelper . arangoNotification ( <nl> + " Document error " , " Documents inserted , but could not be removed . " <nl> + ) ; <nl> + } <nl> + } ) ; <nl> + } , <nl> + error : function ( data ) { <nl> + window . progressView . hide ( ) ; <nl> + arangoHelper . arangoNotification ( " Document error " , " Could not move selected documents . " ) ; <nl> + } <nl> + } ) ; <nl> + } , <nl> + <nl> getDocuments : function ( callback ) { <nl> window . progressView . show ( " Fetching documents . . . " ) ; <nl> var self = this , <nl> mmm a / js / apps / system / aardvark / frontend / js / templates / documentsView . ejs <nl> ppp b / js / apps / system / aardvark / frontend / js / templates / documentsView . ejs <nl> <nl> < div class = " queryline " > <nl> < div style = " float : left ; margin - top : 5px " > < div style = " float : left " class = " selectedCount " > 0 < / div > . Documents selected < / div > <nl> < button id = " deleteSelected " class = " button - neutral btn - old - padding " style = " float : right " > Delete < / button > <nl> + < button id = " moveSelected " class = " button - neutral btn - old - padding " style = " float : right " > Move < / button > <nl> < / div > <nl> < / div > <nl> <nl> mmm a / js / apps / system / aardvark / frontend / js / views / documentsView . js <nl> ppp b / js / apps / system / aardvark / frontend / js / views / documentsView . js <nl> <nl> next : null <nl> } , <nl> <nl> + editButtons : [ " # deleteSelected " , " # moveSelected " ] , <nl> + <nl> initialize : function ( ) { <nl> this . documentStore = this . options . documentStore ; <nl> this . collectionsStore = this . options . collectionsStore ; <nl> <nl> " click # documentsTableID tbody tr " : " clicked " , <nl> " click # deleteDoc " : " remove " , <nl> " click # deleteSelected " : " deleteSelectedDocs " , <nl> + " click # moveSelected " : " moveSelectedDocs " , <nl> " click # addDocumentButton " : " addDocument " , <nl> " click # documents_first " : " firstDocuments " , <nl> " click # documents_last " : " lastDocuments " , <nl> <nl> } <nl> } , <nl> <nl> + moveSelectedDocs : function ( ) { <nl> + var buttons = [ ] , tableContent = [ ] ; <nl> + var toDelete = this . getSelectedDocs ( ) ; <nl> + <nl> + if ( toDelete . length = = = 0 ) { <nl> + return ; <nl> + } <nl> + <nl> + tableContent . push ( <nl> + window . modalView . createTextEntry ( <nl> + ' move - documents - to ' , <nl> + ' Move to ' , <nl> + ' ' , <nl> + false , <nl> + ' collection - name ' , <nl> + true , <nl> + [ <nl> + { <nl> + rule : Joi . string ( ) . regex ( / ^ [ a - zA - Z ] / ) , <nl> + msg : " Collection name must always start with a letter . " <nl> + } , <nl> + { <nl> + rule : Joi . string ( ) . regex ( / ^ [ a - zA - Z0 - 9 \ - _ ] * $ / ) , <nl> + msg : ' Only Symbols " _ " and " - " are allowed . ' <nl> + } , <nl> + { <nl> + rule : Joi . string ( ) . required ( ) , <nl> + msg : " No collection name given . " <nl> + } <nl> + ] <nl> + ) <nl> + ) ; <nl> + <nl> + buttons . push ( <nl> + window . modalView . createSuccessButton ( ' Move ' , this . confirmMoveSelectedDocs . bind ( this ) ) <nl> + ) ; <nl> + <nl> + window . modalView . show ( <nl> + ' modalTable . ejs ' , <nl> + ' Move documents ' , <nl> + buttons , <nl> + tableContent <nl> + ) ; <nl> + } , <nl> + <nl> + confirmMoveSelectedDocs : function ( ) { <nl> + var toMove = this . getSelectedDocs ( ) , <nl> + self = this , <nl> + toCollection = $ ( ' . modal - body ' ) . last ( ) . find ( ' # move - documents - to ' ) . val ( ) ; <nl> + <nl> + var callback = function ( ) { <nl> + this . collection . getDocuments ( this . getDocsCallback . bind ( this ) ) ; <nl> + $ ( ' # markDocuments ' ) . click ( ) ; <nl> + window . modalView . hide ( ) ; <nl> + } . bind ( this ) ; <nl> + <nl> + _ . each ( toMove , function ( key ) { <nl> + self . collection . moveDocument ( key , self . collection . collectionID , toCollection , callback ) ; <nl> + } ) ; <nl> + } , <nl> + <nl> deleteSelectedDocs : function ( ) { <nl> var buttons = [ ] , tableContent = [ ] ; <nl> var toDelete = this . getSelectedDocs ( ) ; <nl> <nl> var selected = this . getSelectedDocs ( ) ; <nl> $ ( ' . selectedCount ' ) . text ( selected . length ) ; <nl> <nl> - if ( selected . length > 0 ) { <nl> - $ ( ' # deleteSelected ' ) . prop ( ' disabled ' , false ) ; <nl> - $ ( ' # deleteSelected ' ) . removeClass ( ' button - neutral ' ) ; <nl> - $ ( ' # deleteSelected ' ) . addClass ( ' button - danger ' ) ; <nl> - $ ( ' # deleteSelected ' ) . removeClass ( ' disabled ' ) ; <nl> - } <nl> - else { <nl> - $ ( ' # deleteSelected ' ) . prop ( ' disabled ' , true ) ; <nl> - $ ( ' # deleteSelected ' ) . addClass ( ' disabled ' ) ; <nl> - $ ( ' # deleteSelected ' ) . addClass ( ' button - neutral ' ) ; <nl> - $ ( ' # deleteSelected ' ) . removeClass ( ' button - danger ' ) ; <nl> - } <nl> + _ . each ( this . editButtons , function ( button ) { <nl> + if ( selected . length > 0 ) { <nl> + $ ( button ) . prop ( ' disabled ' , false ) ; <nl> + $ ( button ) . removeClass ( ' button - neutral ' ) ; <nl> + $ ( button ) . removeClass ( ' disabled ' ) ; <nl> + if ( button = = = " # moveSelected " ) { <nl> + $ ( button ) . addClass ( ' button - success ' ) ; <nl> + } <nl> + else { <nl> + $ ( button ) . addClass ( ' button - danger ' ) ; <nl> + } <nl> + } <nl> + else { <nl> + $ ( button ) . prop ( ' disabled ' , true ) ; <nl> + $ ( button ) . addClass ( ' disabled ' ) ; <nl> + $ ( button ) . addClass ( ' button - neutral ' ) ; <nl> + if ( button = = = " # moveSelected " ) { <nl> + $ ( button ) . removeClass ( ' button - success ' ) ; <nl> + } <nl> + else { <nl> + $ ( button ) . removeClass ( ' button - danger ' ) ; <nl> + } <nl> + } <nl> + } ) ; <nl> return ; <nl> } <nl> <nl>
|
added possibility to move selected documents to another collection
|
arangodb/arangodb
|
9fb9aa2cf1db85326707cce57e758d138ced0409
|
2014-08-22T13:06:07Z
|
mmm a / tensorflow / python / keras / engine / training . py <nl> ppp b / tensorflow / python / keras / engine / training . py <nl> def fit ( self , <nl> # Make sure that y , sample_weights , validation_split are not passed . <nl> training_utils . validate_dataset_input ( x , y , sample_weight , <nl> validation_split ) <nl> + if ( isinstance ( x , ( dataset_ops . DatasetV1 , dataset_ops . DatasetV2 ) ) <nl> + and shuffle ) : <nl> + training_utils . verify_dataset_shuffled ( x ) <nl> + <nl> return self . fit_generator ( <nl> x , <nl> steps_per_epoch = steps_per_epoch , <nl> def _distribution_standardize_user_data ( self , <nl> raise NotImplementedError ( ' ` sample_weight ` is currently not supported ' <nl> ' when using TPUStrategy . ' ) <nl> <nl> - # Validates ` steps ` argument right at the beginning since we use it to <nl> - # construct the dataset object . <nl> + # Validates ` steps ` and ` shuffle ` arguments right at the beginning <nl> + # since we use it to construct the dataset object . <nl> # TODO ( anjalisridhar ) : Remove this check once we refactor the <nl> # _standardize_user_data code path . This check is already present elsewhere <nl> # in the codebase . <nl> - if check_steps and isinstance ( x , dataset_ops . DatasetV2 ) and steps is None : <nl> - raise ValueError ( ' When using Datasets as input , ' <nl> - ' you should specify the ` { steps_name } ` argument . ' <nl> - . format ( steps_name = steps_name ) ) <nl> + if isinstance ( x , dataset_ops . DatasetV2 ) : <nl> + if shuffle : <nl> + training_utils . verify_dataset_shuffled ( x ) <nl> + <nl> + if check_steps and steps is None : <nl> + raise ValueError ( ' When using Datasets as input , ' <nl> + ' you should specify the ` { steps_name } ` argument . ' <nl> + . format ( steps_name = steps_name ) ) <nl> <nl> if ops . executing_eagerly_outside_functions ( ) : <nl> session = None <nl> def _standardize_user_data ( self , <nl> # the tensors from the dataset and we output them . <nl> training_utils . validate_dataset_input ( x , y , sample_weight , <nl> validation_split ) <nl> + if shuffle : <nl> + training_utils . verify_dataset_shuffled ( x ) <nl> + <nl> is_dataset = True <nl> if extract_tensors_from_dataset : <nl> # We do this for ` train_on_batch ` / etc . <nl> mmm a / tensorflow / python / keras / engine / training_utils . py <nl> ppp b / tensorflow / python / keras / engine / training_utils . py <nl> <nl> from tensorflow . python . ops import array_ops <nl> from tensorflow . python . ops import math_ops <nl> from tensorflow . python . ops import weights_broadcast_ops <nl> + from tensorflow . python . platform import tf_logging as logging <nl> from tensorflow . python . util import nest <nl> <nl> <nl> def assert_not_shuffled ( dataset ) : <nl> raise ValueError ( ' Could not assert that dataset is not shuffled . ' ) <nl> <nl> <nl> + def verify_dataset_shuffled ( x ) : <nl> + " " " Verifies that the dataset is shuffled . <nl> + <nl> + Args : <nl> + x : Dataset passed as an input to the model . <nl> + <nl> + Raises : <nl> + ValueError : if the dataset is not already shuffled . <nl> + " " " <nl> + assert isinstance ( x , dataset_ops . DatasetV2 ) <nl> + try : <nl> + assert_not_shuffled ( x ) <nl> + except ValueError : <nl> + # Dataset may or may not be shuffled . <nl> + return <nl> + else : <nl> + logging . warning ( ' Expected a shuffled dataset but input dataset ` x ` is ' <nl> + ' not shuffled . Please invoke ` shuffle ( ) ` on input dataset . ' ) <nl> + <nl> + <nl> def is_dataset_or_iterator ( data ) : <nl> return isinstance ( data , ( dataset_ops . DatasetV1 , <nl> dataset_ops . DatasetV2 , <nl> mmm a / tensorflow / python / keras / engine / training_utils_test . py <nl> ppp b / tensorflow / python / keras / engine / training_utils_test . py <nl> <nl> from tensorflow . python . keras . engine import training_utils <nl> from tensorflow . python . keras . utils import tf_utils <nl> from tensorflow . python . platform import test <nl> + from tensorflow . python . platform import tf_logging as logging <nl> <nl> <nl> class ModelInputsTest ( test . TestCase ) : <nl> def test_assert_not_shuffled ( self , dataset_fn , expected_error = None ) : <nl> with self . assertRaises ( expected_error ) : <nl> training_utils . assert_not_shuffled ( dataset_fn ( ) ) <nl> <nl> + def test_verify_dataset_shuffled ( self ) : <nl> + dataset = dataset_ops . Dataset . range ( 5 ) <nl> + training_utils . assert_not_shuffled ( dataset ) <nl> + <nl> + with test . mock . patch . object ( logging , ' warning ' ) as mock_log : <nl> + training_utils . verify_dataset_shuffled ( dataset ) <nl> + self . assertRegexpMatches ( <nl> + str ( mock_log . call_args ) , <nl> + ' input dataset ` x ` is not shuffled . ' ) <nl> + <nl> + shuffled_dataset = dataset . shuffle ( 10 ) <nl> + training_utils . verify_dataset_shuffled ( shuffled_dataset ) <nl> + <nl> <nl> class StandardizeWeightsTest ( keras_parameterized . TestCase ) : <nl> <nl>
|
[ tf . keras ] Add warning message when non - shuffled dataset input is passed when ` shuffle ` parameter of fit ( ) is set to True .
|
tensorflow/tensorflow
|
a79cdcf41968cdadce2c65ec4933a9cf5998910b
|
2019-01-12T02:45:33Z
|
mmm a / utils / build - script <nl> ppp b / utils / build - script <nl> class BuildScriptInvocation ( object ) : <nl> <nl> targets_needing_toolchain = [ <nl> ' build_indexstoredb ' , <nl> + ' build_pythonkit ' , <nl> ' build_sourcekitlsp ' , <nl> ' build_toolchainbenchmarks ' , <nl> ' tsan_libdispatch_test ' , <nl> class BuildScriptInvocation ( object ) : <nl> # Infer if ninja is required <nl> ninja_required = ( <nl> args . cmake_generator = = ' Ninja ' or args . build_foundation or <nl> - args . build_sourcekitlsp or args . build_indexstoredb ) <nl> + args . build_pythonkit or args . build_sourcekitlsp or <nl> + args . build_indexstoredb ) <nl> if ninja_required and toolchain . ninja is None : <nl> args . build_ninja = True <nl> <nl> class BuildScriptInvocation ( object ) : <nl> product_classes . append ( products . SwiftEvolve ) <nl> if self . args . build_indexstoredb : <nl> product_classes . append ( products . IndexStoreDB ) <nl> + if self . args . build_pythonkit : <nl> + product_classes . append ( products . PythonKit ) <nl> if self . args . build_sourcekitlsp : <nl> product_classes . append ( products . SourceKitLSP ) <nl> if self . args . build_toolchainbenchmarks : <nl> mmm a / utils / build_swift / build_swift / driver_arguments . py <nl> ppp b / utils / build_swift / build_swift / driver_arguments . py <nl> def _apply_default_arguments ( args ) : <nl> args . build_libdispatch = False <nl> args . build_libicu = False <nl> args . build_playgroundsupport = False <nl> + args . build_pythonkit = False <nl> <nl> # - - skip - { ios , tvos , watchos } or - - skip - build - { ios , tvos , watchos } are <nl> # merely shorthands for - - skip - build - { * * os } - { device , simulator } <nl> def create_argument_parser ( ) : <nl> toggle_true ( ' swiftsyntax_verify_generated_files ' ) , <nl> help = ' set to verify that the generated files in the source tree ' <nl> ' match the ones that would be generated from current master ' ) <nl> + option ( [ ' - - install - pythonkit ' ] , toggle_true ( ' install_pythonkit ' ) , <nl> + help = ' install PythonKit ' ) <nl> option ( [ ' - - install - sourcekit - lsp ' ] , toggle_true ( ' install_sourcekitlsp ' ) , <nl> help = ' install SourceKitLSP ' ) <nl> option ( [ ' - - install - skstresstester ' ] , toggle_true ( ' install_skstresstester ' ) , <nl> def create_argument_parser ( ) : <nl> option ( ' - - playgroundsupport ' , store_true ( ' build_playgroundsupport ' ) , <nl> help = ' build PlaygroundSupport ' ) <nl> <nl> + option ( ' - - pythonkit ' , store_true ( ' build_pythonkit ' ) , <nl> + help = ' build PythonKit ' ) <nl> + <nl> option ( ' - - build - ninja ' , toggle_true , <nl> help = ' build the Ninja tool ' ) <nl> <nl> def create_argument_parser ( ) : <nl> option ( ' - - skip - test - cygwin ' , toggle_false ( ' test_cygwin ' ) , <nl> help = ' skip testing Swift stdlibs for Cygwin ' ) <nl> <nl> + option ( ' - - test - pythonkit ' , toggle_true ( ' test_pythonkit ' ) , <nl> + help = ' skip testing PythonKit ' ) <nl> + <nl> # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> in_group ( ' Run build ' ) <nl> <nl> mmm a / utils / build_swift / tests / expected_options . py <nl> ppp b / utils / build_swift / tests / expected_options . py <nl> <nl> ' build_ninja ' : False , <nl> ' build_osx ' : True , <nl> ' build_playgroundsupport ' : False , <nl> + ' build_pythonkit ' : False , <nl> ' build_runtime_with_host_compiler ' : False , <nl> ' build_stdlib_deployment_targets ' : [ ' all ' ] , <nl> ' build_subdir ' : None , <nl> <nl> ' install_swiftpm ' : False , <nl> ' install_swiftsyntax ' : False , <nl> ' swiftsyntax_verify_generated_files ' : False , <nl> + ' install_pythonkit ' : False , <nl> ' install_sourcekitlsp ' : False , <nl> ' install_skstresstester ' : False , <nl> ' install_swiftevolve ' : False , <nl> <nl> ' test_optimized ' : None , <nl> ' test_osx ' : False , <nl> ' test_paths ' : [ ] , <nl> + ' test_pythonkit ' : False , <nl> ' test_tvos ' : False , <nl> ' test_tvos_host ' : False , <nl> ' test_tvos_simulator ' : False , <nl> class BuildScriptImplOption ( _BaseOption ) : <nl> SetTrueOption ( ' - - maccatalyst ' , dest = ' maccatalyst ' ) , <nl> SetTrueOption ( ' - - maccatalyst - ios - tests ' , dest = ' maccatalyst_ios_tests ' ) , <nl> SetTrueOption ( ' - - playgroundsupport ' , dest = ' build_playgroundsupport ' ) , <nl> + SetTrueOption ( ' - - pythonkit ' , dest = ' build_pythonkit ' ) , <nl> + SetTrueOption ( ' - - install - pythonkit ' , dest = ' install_pythonkit ' ) , <nl> + SetTrueOption ( ' - - test - pythonkit ' , dest = ' test_pythonkit ' ) , <nl> SetTrueOption ( ' - - skip - build ' ) , <nl> SetTrueOption ( ' - - swiftpm ' , dest = ' build_swiftpm ' ) , <nl> SetTrueOption ( ' - - swiftsyntax ' , dest = ' build_swiftsyntax ' ) , <nl> mmm a / utils / swift_build_support / swift_build_support / products / __init__ . py <nl> ppp b / utils / swift_build_support / swift_build_support / products / __init__ . py <nl> <nl> from . lldb import LLDB <nl> from . llvm import LLVM <nl> from . ninja import Ninja <nl> + from . pythonkit import PythonKit <nl> from . skstresstester import SKStressTester <nl> from . sourcekitlsp import SourceKitLSP <nl> from . swift import Swift <nl> <nl> ' LLDB ' , <nl> ' LLVM ' , <nl> ' Ninja ' , <nl> + ' PythonKit ' , <nl> ' Swift ' , <nl> ' SwiftPM ' , <nl> ' XCTest ' , <nl> new file mode 100644 <nl> index 000000000000 . . 7b2d4667d8f1 <nl> mmm / dev / null <nl> ppp b / utils / swift_build_support / swift_build_support / products / pythonkit . py <nl> <nl> + # swift_build_support / products / pythonkit . py mmmmmmmmmmmmmmmmmmmmm * - python - * - <nl> + # <nl> + # This source file is part of the Swift . org open source project <nl> + # <nl> + # Copyright ( c ) 2014 - 2017 Apple Inc . and the Swift project authors <nl> + # Licensed under Apache License v2 . 0 with Runtime Library Exception <nl> + # <nl> + # See https : / / swift . org / LICENSE . txt for license information <nl> + # See https : / / swift . org / CONTRIBUTORS . txt for the list of Swift project authors <nl> + # <nl> + # mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - <nl> + <nl> + from . import product <nl> + from . . import shell <nl> + <nl> + <nl> + class PythonKit ( product . Product ) : <nl> + @ classmethod <nl> + def product_source_name ( cls ) : <nl> + return " PythonKit " <nl> + <nl> + @ classmethod <nl> + def is_build_script_impl_product ( cls ) : <nl> + return False <nl> + <nl> + def should_build ( self , host_target ) : <nl> + return True <nl> + <nl> + def build ( self , host_target ) : <nl> + shell . call ( [ <nl> + self . toolchain . cmake , <nl> + ' - G ' , ' Ninja ' , <nl> + ' - D ' , ' BUILD_SHARED_LIBS = YES ' , <nl> + ' - D ' , ' CMAKE_INSTALL_PREFIX = { } / usr ' . format ( <nl> + self . args . install_destdir ) , <nl> + ' - D ' , ' CMAKE_MAKE_PROGRAM = { } ' . format ( self . toolchain . ninja ) , <nl> + ' - D ' , ' CMAKE_Swift_COMPILER = { } ' . format ( self . toolchain . swiftc ) , <nl> + ' - B ' , self . build_dir , <nl> + ' - S ' , self . source_dir , <nl> + ] ) <nl> + shell . call ( [ <nl> + self . toolchain . cmake , <nl> + ' - - build ' , self . build_dir , <nl> + ] ) <nl> + <nl> + def should_test ( self , host_target ) : <nl> + return self . args . test_pythonkit <nl> + <nl> + def test ( self , host_target ) : <nl> + pass <nl> + <nl> + def should_install ( self , host_target ) : <nl> + return self . args . install_pythonkit <nl> + <nl> + def install ( self , host_target ) : <nl> + shell . call ( [ <nl> + self . toolchain . cmake , <nl> + ' - - build ' , self . build_dir , <nl> + ' - - target ' , ' install ' , <nl> + ] ) <nl> mmm a / utils / swift_build_support / swift_build_support / toolchain . py <nl> ppp b / utils / swift_build_support / swift_build_support / toolchain . py <nl> def _getter ( self ) : <nl> _register ( " llvm_cov " , " llvm - cov " ) <nl> _register ( " lipo " , " lipo " ) <nl> _register ( " libtool " , " libtool " ) <nl> + _register ( " swiftc " , " swiftc " ) <nl> <nl> <nl> class Darwin ( Toolchain ) : <nl> mmm a / utils / update_checkout / update - checkout - config . json <nl> ppp b / utils / update_checkout / update - checkout - config . json <nl> <nl> " remote " : { " id " : " KitWare / CMake " } , <nl> " platforms " : [ " Linux " ] <nl> } , <nl> + " pythonkit " : { <nl> + " remote " : { " id " : " pvieito / PythonKit " } <nl> + } , <nl> " indexstore - db " : { <nl> " remote " : { " id " : " apple / indexstore - db " } } , <nl> " sourcekit - lsp " : { <nl> <nl> " cmake " : " v3 . 15 . 1 " , <nl> " indexstore - db " : " master " , <nl> " sourcekit - lsp " : " master " , <nl> - " swift - format " : " master " <nl> + " swift - format " : " master " , <nl> + " pythonkit " : " master " <nl> } <nl> } , <nl> " next " : { <nl>
|
Merge remote - tracking branch ' origin / master ' into master - next
|
apple/swift
|
14d98448bb67672fecfe0b6173b978bf8f611601
|
2020-01-25T17:19:32Z
|
new file mode 100644 <nl> index 000000000000 . . cedb1655dc8d <nl> mmm / dev / null <nl> ppp b / validation - test / compiler_crashers / 28675 - swift - typebase - getdesugaredtype . swift <nl> <nl> + / / This source file is part of the Swift . org open source project <nl> + / / Copyright ( c ) 2014 - 2017 Apple Inc . and the Swift project authors <nl> + / / Licensed under Apache License v2 . 0 with Runtime Library Exception <nl> + / / <nl> + / / See https : / / swift . org / LICENSE . txt for license information <nl> + / / See https : / / swift . org / CONTRIBUTORS . txt for the list of Swift project authors <nl> + <nl> + / / RUN : not - - crash % target - swift - frontend % s - emit - ir <nl> + Int ) func b ( UInt = 1 + 1 + 1 + 1 as ? Int ) { { { { { { { { { { { { { a { <nl>
|
Merge pull request from practicalswift / swiftc - 28675 - swift - typebase - getdesugaredtype
|
apple/swift
|
661a503bc9a18463063eac6a7d868d9359b2fc8a
|
2017-01-31T07:45:05Z
|
mmm a / locale / nl / LC_MESSAGES / bitcoin . po <nl> ppp b / locale / nl / LC_MESSAGES / bitcoin . po <nl> msgstr " " <nl> <nl> # : . . / . . / . . / init . cpp : 342 <nl> msgid " Usage : bitcoin [ options ] " <nl> - msgstr " " <nl> + msgstr " Commandoregel : bitcoin [ opties ] " <nl> <nl> # : . . / . . / . . / init . cpp : 343 <nl> msgid " Options : \ n " <nl> msgstr " Genereer geen coins \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 346 <nl> msgid " Start minimized \ n " <nl> - msgstr " Start geminimalizeerd \ n " <nl> + msgstr " Geminimaliseerd starten \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 347 <nl> msgid " Specify data directory \ n " <nl> - msgstr " Specificeer data map \ n " <nl> + msgstr " Stel datamap in \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 348 <nl> msgid " Connect through socks4 proxy \ n " <nl> msgstr " Verbind via socks4 proxy \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 349 <nl> msgid " Add a node to connect to \ n " <nl> - msgstr " Voeg een node om naar te verbinden toe \ n " <nl> + msgstr " Voeg een node toe om mee te verbinden \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 350 <nl> msgid " Connect only to the specified node \ n " <nl> - msgstr " Verbind alleen naar deze node \ n " <nl> + msgstr " Verbind alleen met deze node \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 351 <nl> msgid " This help message \ n " <nl> - msgstr " " <nl> + msgstr " Dit helpbericht \ n " <nl> <nl> # : . . / . . / . . / init . cpp : 455 <nl> msgid " Error loading addr . dat \ n " <nl> msgstr " Foutief - proxy adres " <nl> <nl> # : . . / . . / . . / init . cpp : 629 <nl> msgid " Program has crashed and will terminate . " <nl> - msgstr " Programma is gecrashed en word afgesloten . " <nl> + msgstr " Het programma is gecrasht en wordt afgesloten . " <nl> <nl> # : . . / . . / . . / main . cpp : 1465 <nl> msgid " Warning : Disk space is low " <nl> - msgstr " Waarschuwng : Gebrek aan schijf ruimte " <nl> + msgstr " Waarschuwing : Weinig schijfruimte over " <nl> <nl> # : . . / . . / . . / main . cpp : 2994 <nl> # , c - format <nl> msgid " Error : This is an oversized transaction that requires a transaction fee of % s " <nl> - msgstr " Fout : Dit is een te grote transactie die een fooi nodig heeft van % s " <nl> + msgstr " Fout : Dit is een te grote transactie , die een fooi vereist van % s " <nl> <nl> # : . . / . . / . . / main . cpp : 2996 <nl> msgid " Error : Transaction creation failed " <nl> - msgstr " Fout : Transactie aanmaak gefaald " <nl> + msgstr " Fout : Aanmaken van transactie mislukt " <nl> <nl> # : . . / . . / . . / main . cpp : 3001 <nl> # : . . / . . / . . / ui . cpp : 1761 <nl> msgstr " Versturen . . . " <nl> <nl> # : . . / . . / . . / main . cpp : 3005 <nl> msgid " Error : The transaction was rejected . This might happen if some of the coins in your wallet were already spent , such as if you used a copy of wallet . dat and coins were spent in the copy but not marked as spent here . " <nl> - msgstr " Fout : De transactie was afgekeurd . Dit kan komen als bepaalde coins in uw Portefeuille al zijn uitgegeven . Dit kan komen doordat u wallet . dat heeft gekopieerd en wat coins heeft uitgegeven en niet terug gekopieerd heeft . " <nl> + msgstr " Fout : De transactie is afgekeurd . Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven . Dit kan veroorzaakt worden doordat je een kopie van wallet . dat gebruikt hebt en enkel daar je uitgave geregistreerd is . " <nl> <nl> # : . . / . . / . . / main . cpp : 3017 <nl> msgid " Invalid amount " <nl> - msgstr " Foutief aantal " <nl> + msgstr " Foutieve hoeveelheid " <nl> <nl> # : . . / . . / . . / main . cpp : 3019 <nl> # : . . / . . / . . / ui . cpp : 1971 <nl> # : . . / . . / . . / ui . cpp : 2038 <nl> msgid " Insufficient funds " <nl> - msgstr " Onvoldoende coins " <nl> + msgstr " Onvoldoende saldo " <nl> <nl> # : . . / . . / . . / main . cpp : 3024 <nl> msgid " Invalid bitcoin address " <nl> - msgstr " Foutief bitcoin adres " <nl> + msgstr " Foutief bitcoin - adres " <nl> <nl> # : . . / . . / . . / ui . cpp : 189 <nl> # , c - format <nl> msgid " This transaction is over the size limit . You can still send it for a fee of % s , which goes to the nodes that process your transaction and helps to support the network . Do you want to pay the fee ? " <nl> - msgstr " Deze transactie is over het limiet . U kunt nog door gaan met de transactie door een fooi te betalen van % s , deze word betaald aan de node die uw tranactie verwerkt . Wilt u de fooi betalen ? " <nl> + msgstr " Deze transactie overschrijdt de limiet . Om de transactie alsnog te verwerken kun je een fooi betalen van % s . Deze zal betaald worden aan de node die uw transactie verwerkt . Wil je doorgaan en deze fooi betalen ? " <nl> <nl> # : . . / . . / . . / ui . cpp : 285 <nl> msgid " Status " <nl> msgstr " Beschrijving " <nl> <nl> # : . . / . . / . . / ui . cpp : 288 <nl> msgid " Debit " <nl> - msgstr " " <nl> + msgstr " Debet " <nl> <nl> # : . . / . . / . . / ui . cpp : 289 <nl> msgid " Credit " <nl> - msgstr " " <nl> + msgstr " Credit " <nl> <nl> # : . . / . . / . . / ui . cpp : 489 <nl> # , c - format <nl> msgid " Open for % d blocks " <nl> - msgstr " Open voor % d blocks " <nl> + msgstr " Open gedurende % d blokken " <nl> <nl> # : . . / . . / . . / ui . cpp : 491 <nl> # , c - format <nl> msgstr " Gegenereerd " <nl> # : . . / . . / . . / ui . cpp : 592 <nl> # , c - format <nl> msgid " Generated ( % s matures in % d more blocks ) " <nl> - msgstr " Gegenereerd ( % s word volwassen in % d blokken ) " <nl> + msgstr " Gegenereerd ( % s wordt volwassen over % d blokken ) " <nl> <nl> # : . . / . . / . . / ui . cpp : 596 <nl> msgid " Generated - Warning : This block was not received by any other nodes and will probably not be accepted ! " <nl> msgstr " Van : " <nl> <nl> # : . . / . . / . . / ui . cpp : 634 <nl> msgid " Received with : " <nl> - msgstr " Ontvangen met : " <nl> + msgstr " Ontvangen op : " <nl> <nl> # : . . / . . / . . / ui . cpp : 676 <nl> msgid " Payment to yourself " <nl> - msgstr " Betaling naar u zelf " <nl> + msgstr " Betaling naar uzelf " <nl> <nl> # : . . / . . / . . / ui . cpp : 713 <nl> msgid " To : " <nl> msgstr " Naar : " <nl> <nl> # : . . / . . / . . / ui . cpp : 1009 <nl> msgid " Generating " <nl> - msgstr " Genereert " <nl> + msgstr " Genereren . . . " <nl> <nl> # : . . / . . / . . / ui . cpp : 1011 <nl> msgid " ( not connected ) " <nl> msgstr " % d verbindingen % d blokken % d transacties " <nl> # : . . / . . / . . / ui . cpp : 1123 <nl> # : . . / . . / . . / ui . cpp : 2351 <nl> msgid " New Receiving Address " <nl> - msgstr " Nieuw Ontvangings Adres " <nl> + msgstr " Nieuw Ontvangstadres " <nl> <nl> # : . . / . . / . . / ui . cpp : 1124 <nl> # : . . / . . / . . / ui . cpp : 2352 <nl> msgid " " <nl> " \ n " <nl> " Label " <nl> msgstr " " <nl> - " Het is goed beleid om een nieuw adres voor elke betaling te hebben . \ n " <nl> + " Het is een goede gewoonte om voor iedere betaling die je ontvangt een nieuw adres aan te maken . \ n " <nl> " \ n " <nl> " Label " <nl> <nl> msgstr " < b > Naar : < / b > " <nl> <nl> # : . . / . . / . . / ui . cpp : 1242 <nl> msgid " ( yours , label : " <nl> - msgstr " " <nl> + msgstr " ( van jou , label : " <nl> <nl> # : . . / . . / . . / ui . cpp : 1244 <nl> # , fuzzy <nl> msgid " ( yours ) " <nl> - msgstr " " <nl> + msgstr " ( van jou ) " <nl> <nl> # : . . / . . / . . / ui . cpp : 1281 <nl> # : . . / . . / . . / ui . cpp : 1293 <nl> # : . . / . . / . . / ui . cpp : 1356 <nl> msgid " < b > Credit : < / b > " <nl> - msgstr " " <nl> + msgstr " < b > Credit : < / b > " <nl> <nl> # : . . / . . / . . / ui . cpp : 1283 <nl> # , c - format <nl> msgid " ( % s matures in % d more blocks ) " <nl> - msgstr " ( % s word volwassen in % d blokken ) " <nl> + msgstr " ( % s wordt volwassen over % d blokken ) " <nl> <nl> # : . . / . . / . . / ui . cpp : 1285 <nl> msgid " ( not accepted ) " <nl> - msgstr " ( niet geaccepteerd " <nl> + msgstr " ( niet geaccepteerd ) " <nl> <nl> # : . . / . . / . . / ui . cpp : 1330 <nl> # : . . / . . / . . / ui . cpp : 1353 <nl> msgid " < b > Debit : < / b > " <nl> - msgstr " " <nl> + msgstr " < b > Debet : < / b > " <nl> <nl> # : . . / . . / . . / ui . cpp : 1344 <nl> msgid " < b > Transaction fee : < / b > " <nl> - msgstr " < b > Transactie fooi : < / b > " <nl> + msgstr " < b > Transactiefooi : < / b > " <nl> <nl> # : . . / . . / . . / ui . cpp : 1360 <nl> msgid " < b > Net amount : < / b > " <nl> - msgstr " < b > Netto bedrag : < / b > " <nl> + msgstr " < b > Nettobedrag : < / b > " <nl> <nl> # : . . / . . / . . / ui . cpp : 1367 <nl> msgid " Message : " <nl> msgstr " Mededeling : " <nl> <nl> # : . . / . . / . . / ui . cpp : 1370 <nl> msgid " Generated coins must wait 120 blocks before they can be spent . When you generated this block , it was broadcast to the network to be added to the block chain . If it fails to get into the chain , it will change to \ " not accepted \ " and not be spendable . This may occasionally happen if another node generates a block within a few seconds of yours . " <nl> - msgstr " Gegenereerde coins moeten 120 blokken wachten voordat ze uitgegeven kunnen worden . Wanneer je dit blok genereerde , werd het naar het netwerk gestuurd om opgenomen teworden in de rest van de blokken . Als dit faalt , dan zal de dit veranderen in \ " niet geaccepteerd \ " en zal niet uitgeefbaar zijn . Dit kan soms gebeuren als een node ook een blok rond dezelfde periode genereerd . " <nl> + msgstr " Gegenereerde coins mogen pas na een wachttijd van 120 blokken uitgegeven worden . Op het moment dat dit blok gegenereerd werd , is het naar het netwerk verzonden om aan de blokkenreeks toegevoegd te worden . Als het niet succesvol in de blokkenreeks opgenomen kan worden verandert de status in \ " niet geaccepteerd \ " en kan het niet uitegegeven worden . Dit kan soms gebeuren als een andere node op ongeveer hetzelfde moment een blok genereert . " <nl> <nl> # : . . / . . / . . / ui . cpp : 1437 <nl> msgid " Main " <nl> - msgstr " Hoofd " <nl> + msgstr " Algemeen " <nl> <nl> # : . . / . . / . . / ui . cpp : 1442 <nl> msgid " & Minimize on close " <nl> - msgstr " & Minimalizeer bij sluiten " <nl> + msgstr " & Minimaliseer bij sluiten van het venster " <nl> <nl> # : . . / . . / . . / ui . cpp : 1595 <nl> # , c - format <nl> msgstr " versie % s % s BETA " <nl> <nl> # : . . / . . / . . / ui . cpp : 1681 <nl> msgid " Will appear as \ " From : Unknown \ " " <nl> - msgstr " Word vertoont als \ " Van : Onbekend \ " " <nl> + msgstr " Wordt weergegeven als \ " Van : Onbekend \ " " <nl> <nl> # : . . / . . / . . / ui . cpp : 1681 <nl> msgid " n / a " <nl> msgstr " Onbekend " <nl> <nl> # : . . / . . / . . / ui . cpp : 1682 <nl> msgid " Can ' t include a message when sending to a Bitcoin address " <nl> - msgstr " Kan geen mededeling versturen bij gebruik van Bitcoin adressen " <nl> + msgstr " Kan geen mededeling bijvoegen bij gebruik van bitcoin - adressen " <nl> <nl> # : . . / . . / . . / ui . cpp : 1735 <nl> msgid " Error in amount " <nl> msgstr " Fout in hoeveelheid " <nl> # : . . / . . / . . / ui . cpp : 1771 <nl> # : . . / . . / . . / uibase . cpp : 61 <nl> msgid " Send Coins " <nl> - msgstr " Verstuur Coins " <nl> + msgstr " Verstuur coins " <nl> <nl> # : . . / . . / . . / ui . cpp : 1740 <nl> msgid " Amount exceeds your balance " <nl> - msgstr " Hoeveelheid hoger dan uw huidige balans " <nl> + msgstr " Hoeveelheid overschrijdt uw huidige balans " <nl> <nl> # : . . / . . / . . / ui . cpp : 1745 <nl> msgid " Total exceeds your balance when the " <nl> - msgstr " Totaal groter dan uw huidige balans wanner de " <nl> + msgstr " Totaal overschrijdt uw huidige balans wanneer de " <nl> <nl> # : . . / . . / . . / ui . cpp : 1745 <nl> msgid " transaction fee is included " <nl> - msgstr " transactie fooi is bijgerekend " <nl> + msgstr " transactiefooi is meegerekend " <nl> <nl> # : . . / . . / . . / ui . cpp : 1761 <nl> msgid " Payment sent " <nl> - msgstr " Betaling verstuurd " <nl> + msgstr " Betaling verzonden " <nl> <nl> # : . . / . . / . . / ui . cpp : 1771 <nl> msgid " Invalid address " <nl> msgstr " Foutief adres " <nl> # : . . / . . / . . / ui . cpp : 1825 <nl> # , c - format <nl> msgid " Sending % s to % s " <nl> - msgstr " Verstuurd % s naar % s " <nl> + msgstr " % s versturen naar % s " <nl> <nl> # : . . / . . / . . / ui . cpp : 1898 <nl> # : . . / . . / . . / ui . cpp : 1931 <nl> msgstr " Foutief antwoord ontvangen " <nl> <nl> # : . . / . . / . . / ui . cpp : 2034 <nl> msgid " Creating transaction . . . " <nl> - msgstr " Maakt transactie aan . . . " <nl> + msgstr " Transactie aanmaken . . . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2046 <nl> # , c - format <nl> msgid " This is an oversized transaction that requires a transaction fee of % s " <nl> - msgstr " Dit is een te grote transactie die een transactie fooi vereist van % s " <nl> + msgstr " Fout : Dit is een te grote transactie , die een fooi vereist van % s " <nl> <nl> # : . . / . . / . . / ui . cpp : 2048 <nl> msgid " Transaction creation failed " <nl> - msgstr " Transactie aanmaak gefaald . " <nl> + msgstr " Aanmaken van transactie mislukt " <nl> <nl> # : . . / . . / . . / ui . cpp : 2055 <nl> msgid " Transaction aborted " <nl> msgstr " Verbinding verloren , transactie geannuleerd " <nl> <nl> # : . . / . . / . . / ui . cpp : 2079 <nl> msgid " Sending payment . . . " <nl> - msgstr " Versturen van betaling . . . " <nl> + msgstr " Betaling versturen . . . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2085 <nl> msgid " The transaction was rejected . This might happen if some of the coins in your wallet were already spent , such as if you used a copy of wallet . dat and coins were spent in the copy but not marked as spent here . " <nl> - msgstr " De transactie was afgekeurd . Dit kan komen als bepaalde coins in uw Portefeuille al zijn uitgegeven . Dit kan komen doordat u wallet . dat heeft gekopieerd en wat coins heeft uitgegeven en niet terug gekopieerd heeft . " <nl> + msgstr " Fout : De transactie is afgekeurd . Dit kan gebeuren als bepaalde coins in je Portefeuille al zijn uitgegeven . Dit kan veroorzaakt worden doordat je een kopie van wallet . dat gebruikt hebt en enkel daar je uitgave geregistreerd is . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2092 <nl> msgid " Waiting for confirmation . . . " <nl> msgid " " <nl> " The transaction is recorded and will credit to the recipient , \ n " <nl> " but the comment information will be blank . " <nl> msgstr " " <nl> - " De betaling was verstuurd , maar de ontvanger kon het niet verifieeren . \ n " <nl> - " De transactie is opgenomen en word uitbetaald aan de ontvanger , \ n " <nl> - " maar de mededeling blijft blank bij de ontanger . " <nl> + " De betaling is verstuurd , maar de ontvanger kon hem niet verifiëren . \ n " <nl> + " De transactie is opgenomen en wordt uitbetaald aan de ontvanger , \ n " <nl> + " maar het mededelings - veld blijft blanco . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2119 <nl> msgid " Payment was sent , but an invalid response was received " <nl> - msgstr " Betaling was verstuurd , maar een foutief antword was ontvangen . " <nl> + msgstr " Betaling is verstuurd , maar een foutief antword is ontvangen . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2125 <nl> msgid " Payment completed " <nl> msgstr " Label " <nl> # : . . / . . / . . / ui . cpp : 2160 <nl> # : . . / . . / . . / uibase . cpp : 908 <nl> msgid " Bitcoin Address " <nl> - msgstr " Bitcoin Adres " <nl> + msgstr " Bitcoin - adres " <nl> <nl> # : . . / . . / . . / ui . cpp : 2284 <nl> msgid " This is one of your own addresses for receiving payments and cannot be entered in the address book . " <nl> - msgstr " Dit is een van uw eigen adressen voor het ontvangen van betalingen en can niet worden toegevoegd aan uw adressen boek . " <nl> + msgstr " Dit is een van uw eigen adressen voor het ontvangen van betalingen , en kan niet worden toegevoegd aan uw adresboek . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2302 <nl> # : . . / . . / . . / ui . cpp : 2308 <nl> msgid " Edit Address " <nl> - msgstr " Bewerk Adres " <nl> + msgstr " Bewerk adres " <nl> <nl> # : . . / . . / . . / ui . cpp : 2314 <nl> msgid " Edit Address Label " <nl> - msgstr " Bewerk Adres Label " <nl> + msgstr " Bewerk adreslabel " <nl> <nl> # : . . / . . / . . / ui . cpp : 2339 <nl> # : . . / . . / . . / ui . cpp : 2345 <nl> msgid " Add Address " <nl> - msgstr " Adres Toevoegen " <nl> + msgstr " Adres toevoegen " <nl> <nl> # : . . / . . / . . / ui . cpp : 2421 <nl> msgid " Bitcoin " <nl> msgstr " Bitcoin " <nl> <nl> # : . . / . . / . . / ui . cpp : 2423 <nl> msgid " Bitcoin - Generating " <nl> - msgstr " Bitcoin - Genereert " <nl> + msgstr " Bitcoin - Genereren . . . " <nl> <nl> # : . . / . . / . . / ui . cpp : 2425 <nl> msgid " Bitcoin - ( not connected ) " <nl> msgstr " O & pties " <nl> # : . . / . . / . . / ui . cpp : 2502 <nl> # : . . / . . / . . / uibase . cpp : 34 <nl> msgid " & Generate Coins " <nl> - msgstr " & Genereer Coins " <nl> + msgstr " & Genereer coins " <nl> <nl> # : . . / . . / . . / ui . cpp : 2505 <nl> # : . . / . . / . . / uibase . cpp : 27 <nl> msgstr " & Bestand " <nl> <nl> # : . . / . . / . . / uibase . cpp : 38 <nl> msgid " & Your Receiving Addresses . . . " <nl> - msgstr " & Uw Ontvang Adressen . . . " <nl> + msgstr " & Uw ontvangstadressen . . . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 42 <nl> msgid " & Options . . . " <nl> msgstr " & Help " <nl> <nl> # : . . / . . / . . / uibase . cpp : 62 <nl> msgid " Address Book " <nl> - msgstr " Adressen Boek " <nl> + msgstr " Adresboek " <nl> <nl> # : . . / . . / . . / uibase . cpp : 77 <nl> msgid " Your Bitcoin Address : " <nl> - msgstr " Uw Bitcoin Address : " <nl> + msgstr " Uw bitcoin - adres : " <nl> <nl> # : . . / . . / . . / uibase . cpp : 84 <nl> msgid " & New . . . " <nl> msgstr " & Nieuw . . . " <nl> # : . . / . . / . . / uibase . cpp : 851 <nl> # : . . / . . / . . / uibase . cpp : 954 <nl> msgid " & Copy to Clipboard " <nl> - msgstr " & Kopieer naar Plakboord " <nl> + msgstr " & Kopieer naar plakbord " <nl> <nl> # : . . / . . / . . / uibase . cpp : 102 <nl> msgid " Balance : " <nl> msgstr " Ontvangen " <nl> <nl> # : . . / . . / . . / uibase . cpp : 121 <nl> msgid " In Progress " <nl> - msgstr " Word Verwerkt " <nl> + msgstr " Wordt verwerkt " <nl> <nl> # : . . / . . / . . / uibase . cpp : 142 <nl> msgid " All Transactions " <nl> msgstr " OK " <nl> <nl> # : . . / . . / . . / uibase . cpp : 361 <nl> msgid " Optional transaction fee you give to the nodes that process your transactions . " <nl> - msgstr " Optionele transactie fooi die u geeft aan de nodes doe uw betaling verwerken . " <nl> + msgstr " Optionele transactiefooi die u geeft aan de nodes die uw transacties verwerken . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 370 <nl> msgid " Transaction fee : " <nl> - msgstr " Transactie fooi : " <nl> + msgstr " Transactiefooi : " <nl> <nl> # : . . / . . / . . / uibase . cpp : 386 <nl> msgid " & Limit coin generation to " <nl> - msgstr " & Limiteer coin generatie tot " <nl> + msgstr " & Limiteer coin - generatie tot " <nl> <nl> # : . . / . . / . . / uibase . cpp : 393 <nl> msgid " processors " <nl> msgstr " & Start Bitcoin wanneer het systeem opstart " <nl> <nl> # : . . / . . / . . / uibase . cpp : 403 <nl> msgid " & Minimize to the tray instead of the taskbar " <nl> - msgstr " & Minimalizeer tot systeemvak inplaats van taakbalk " <nl> + msgstr " & Minimaliseer tot systeemvak in plaats van de taakbalk " <nl> <nl> # : . . / . . / . . / uibase . cpp : 407 <nl> msgid " M & inimize to the tray on close " <nl> - msgstr " M & inimalizeer tot taakbalk bij sluiten " <nl> + msgstr " M & inimaliseer tot taakbalk bij sluiten " <nl> <nl> # : . . / . . / . . / uibase . cpp : 414 <nl> msgid " & Connect through socks4 proxy : " <nl> msgstr " " <nl> # : . . / . . / . . / uibase . cpp : 966 <nl> # : . . / . . / . . / uibase . cpp : 1055 <nl> msgid " Cancel " <nl> - msgstr " Annuleer " <nl> + msgstr " Annuleren " <nl> <nl> # : . . / . . / . . / uibase . cpp : 485 <nl> msgid " & Apply " <nl> msgid " " <nl> " OpenSSL Toolkit ( http : / / www . openssl . org / ) and cryptographic software written by \ n " <nl> " Eric Young ( eay @ cryptsoft . com ) . " <nl> msgstr " " <nl> - " Copyright ( c ) 2009 - 2010 Bitcoin Developers \ n " <nl> + " Copyright ( c ) 2009 - 2011 Bitcoin - ontwikkelaars \ n " <nl> " \ n " <nl> " Dit is experimentele software . \ n " <nl> " \ n " <nl> - " Gedistributeerd onder de MIT / X11 software licentie , see het bijbehorende bestand \ n " <nl> - " license . txt of http : / / www . opensource . org / licenses / mit - license . php . \ n " <nl> + " Gedistributeerd onder de MIT / X11 software licentie , zie het bijgevoegde bestand \ n " <nl> + " license . txt of kijk op http : / / www . opensource . org / licenses / mit - license . php . \ n " <nl> " \ n " <nl> - " Dit product komt met software ontwikkeld door het OpenSSL Project for gebruik \ n " <nl> - " in de OpenSSL Toolkit ( http : / / www . openssl . org / ) and de cryptografische \ n " <nl> + " Dit product bevat software ontwikkeld door het OpenSSL project for gebruik \ n " <nl> + " in de OpenSSL Toolkit ( http : / / www . openssl . org / ) , en cryptografische \ n " <nl> " software geschreven door Eric Young ( eay @ cryptsoft . com ) . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 619 <nl> msgid " Enter a Bitcoin address ( e . g . 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L ) or IP address ( e . g . 123 . 45 . 6 . 7 ) " <nl> - msgstr " Voer een Bitcoin adres ( bijvoorbeeld : 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L ) of IP address ( bijvoorbeeld : 123 . 45 . 6 . 7 ) in . " <nl> + msgstr " Voer een bitcoin - adres ( bijvoorbeeld : 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJED9L ) of IP - adres ( bijvoorbeeld : 123 . 45 . 6 . 7 ) in . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 633 <nl> msgid " Pay & To : " <nl> - msgstr " Betaal & Naar : " <nl> + msgstr " Betaal & aan : " <nl> <nl> # : . . / . . / . . / uibase . cpp : 648 <nl> msgid " & Paste " <nl> msgstr " & Plakken " <nl> <nl> # : . . / . . / . . / uibase . cpp : 651 <nl> msgid " Address & Book . . . " <nl> - msgstr " Adressen & Boek . . . " <nl> + msgstr " Adres & boek . . . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 658 <nl> msgid " & Amount : " <nl> msgstr " & Mededeling : " <nl> <nl> # : . . / . . / . . / uibase . cpp : 730 <nl> msgid " & Send " <nl> - msgstr " & Verstuur " <nl> + msgstr " & Versturen " <nl> <nl> # : . . / . . / . . / uibase . cpp : 782 <nl> msgid " " <nl> msgstr " " <nl> <nl> # : . . / . . / . . / uibase . cpp : 832 <nl> msgid " These are your Bitcoin addresses for receiving payments . You may want to give a different one to each sender so you can keep track of who is paying you . The highlighted address is displayed in the main window . " <nl> - msgstr " Dit zijn uw Bitcoin Adressen voor het ontvangen van betalingen . Misschien wilt u elk contact persoon een ander adres geven zodat u kunt bij houden wie er u heeft betaald . De opgelichte adressen worden weergeven in het hoofd venster . " <nl> + msgstr " Dit zijn je bitcoin - adressen voor het ontvangen van betalingen . Het is een goed idee iedere afzender een ander adres te geven zodat je bij kunt houden wie je een betaling stuurt . Het geselecteerde adres is zichtbaar in het hoofdscherm . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 845 <nl> # : . . / . . / . . / uibase . cpp : 957 <nl> msgid " & Edit . . . " <nl> - msgstr " & Bewerk . . . " <nl> + msgstr " & Bewerken . . . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 848 <nl> # : . . / . . / . . / uibase . cpp : 960 <nl> msgid " & New Address . . . " <nl> - msgstr " & New Adres . . . " <nl> + msgstr " & Nieuw adres . . . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 920 <nl> msgid " Sending " <nl> - msgstr " Versturen " <nl> + msgstr " Versturen . . . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 928 <nl> msgid " These are your Bitcoin addresses for receiving payments . You can give a different one to each sender to keep track of who is paying you . The highlighted address will be displayed in the main window . " <nl> - msgstr " Dit zijn uw Bitcoin adressen voor het ontvangen van betalingen . U kunt een aan elk contact persoon geven zodat u een overzicht kunt houden wie u betaald . Dit adres zal wergeven worden in het hoofd main venster . " <nl> + msgstr " Dit zijn je bitcoin - adressen voor het ontvangen van betalingen . Het is een goed idee iedere afzender een ander adres te geven zodat je bij kunt houden wie je een betaling stuurt . Het geselecteerde adres is zichtbaar in het hoofdscherm . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 941 <nl> msgid " Receiving " <nl> - msgstr " Ontvangen " <nl> + msgstr " Ontvangen . . . " <nl> <nl> # : . . / . . / . . / uibase . cpp : 951 <nl> msgid " & Delete " <nl> - msgstr " & Verwijder " <nl> + msgstr " & Verwijderen " <nl> <nl> # : . . / . . / . . / uibase . h : 150 <nl> msgid " Transaction Details " <nl> - msgstr " Transactie Details " <nl> + msgstr " Transactiedetails " <nl> <nl> # : . . / . . / . . / uibase . h : 203 <nl> msgid " Options " <nl> msgstr " Over Bitcoin " <nl> <nl> # : . . / . . / . . / uibase . h : 341 <nl> msgid " Your Bitcoin Addresses " <nl> - msgstr " Uw Bitcoin Adressen " <nl> + msgstr " Uw bitcoin - adressen " <nl>
|
Updated dutch translation
|
bitcoin/bitcoin
|
a07dca7cd2012dd26af73facfee381aedcb9cc0e
|
2011-03-18T23:58:16Z
|
mmm a / build / deps / github_hashes / facebook / fbthrift - rev . txt <nl> ppp b / build / deps / github_hashes / facebook / fbthrift - rev . txt <nl> @ @ - 1 + 1 @ @ <nl> - Subproject commit a26bd2c73b5248926d688fc055c94eba1f192d8c <nl> + Subproject commit bd2afda5272c1017923cad636c45ac7db5fb819e <nl> mmm a / build / deps / github_hashes / facebook / folly - rev . txt <nl> ppp b / build / deps / github_hashes / facebook / folly - rev . txt <nl> @ @ - 1 + 1 @ @ <nl> - Subproject commit 12314eb7d61c8dc7926eeaf969b887de61542135 <nl> + Subproject commit 2ac8a368ba1898f25d48bffbf8c95834dcce8eda <nl>
|
Updating submodules
|
facebook/watchman
|
521d98bc4a8ada3ed8b7c7c19887ea62c0c5f447
|
2019-02-22T00:44:53Z
|
mmm a / example / README . md <nl> ppp b / example / README . md <nl> Typically when you have a ` plt . imshow ( ) ` you want the image tag ` [ png ] ( img . png ) ` <nl> * [ class active maps ] ( https : / / github . com / dmlc / mxnet - notebooks / blob / master / python / moved - from - mxnet / class_active_maps . ipynb ) - A demo of how to localize the discriminative regions in an image using global average pooling ( GAP ) in CNNs . <nl> * [ DMLC MXNet Notebooks ] ( https : / / github . com / dmlc / mxnet - notebooks ) DMLC ' s repo for various notebooks ranging from basic usages of MXNet to state - of - the - art deep learning applications . <nl> * [ AWS Seoul Summit 2017 Demos ] ( https : / / github . com / sxjscience / aws - summit - 2017 - seoul ) The demo codes and ipython notebooks in AWS Seoul Summit 2017 . <nl> + * [ Character - level CNN for text classification ] ( https : / / github . com / ThomasDelteil / CNN_NLP_MXNet ) Performing category classification on Amazon reviews using Gluon and character - level Convolutional Neural Networks <nl> <nl> # # # < a name = " mobile - apps - examples " > < / a > Mobile App Examples <nl> mmmmmmmmmmmmmmmmmm - <nl>
|
Add CNN - character level to the examples list ( )
|
apache/incubator-mxnet
|
74cd22011f6836f129f6506d50d6e2999993eaa7
|
2018-04-05T20:04:32Z
|
mmm a / tensorflow / contrib / makefile / tf_op_files . txt <nl> ppp b / tensorflow / contrib / makefile / tf_op_files . txt <nl> tensorflow / core / kernels / inplace_ops . cc <nl> tensorflow / core / kernels / in_topk_op . cc <nl> tensorflow / core / kernels / immutable_constant_op . cc <nl> tensorflow / core / kernels / identity_op . cc <nl> + tensorflow / core / kernels / identity_n_op . cc <nl> tensorflow / core / kernels / gather_op . cc <nl> tensorflow / core / kernels / gather_functor . cc <nl> tensorflow / core / kernels / fused_batch_norm_op . cc <nl> mmm a / tensorflow / core / kernels / BUILD <nl> ppp b / tensorflow / core / kernels / BUILD <nl> cc_library ( <nl> " : extract_image_patches_op " , <nl> " : gather_nd_op " , <nl> " : gather_op " , <nl> + " : identity_n_op " , <nl> " : identity_op " , <nl> " : inplace_ops " , <nl> " : listdiff_op " , <nl> tf_kernel_library ( <nl> deps = ARRAY_DEPS , <nl> ) <nl> <nl> + tf_kernel_library ( <nl> + name = " identity_n_op " , <nl> + prefix = " identity_n_op " , <nl> + deps = ARRAY_DEPS , <nl> + ) <nl> + <nl> tf_kernel_library ( <nl> name = " listdiff_op " , <nl> prefix = " listdiff_op " , <nl> tf_cc_test ( <nl> ] , <nl> ) <nl> <nl> + tf_cc_test ( <nl> + name = " identity_n_op_test " , <nl> + size = " small " , <nl> + srcs = [ " identity_n_op_test . cc " ] , <nl> + deps = [ <nl> + " : identity_n_op " , <nl> + " : ops_testutil " , <nl> + " : ops_util " , <nl> + " / / tensorflow / core : core_cpu " , <nl> + " / / tensorflow / core : framework " , <nl> + " / / tensorflow / core : lib " , <nl> + " / / tensorflow / core : protos_all_cc " , <nl> + " / / tensorflow / core : test " , <nl> + " / / tensorflow / core : test_main " , <nl> + " / / tensorflow / core : testlib " , <nl> + ] , <nl> + ) <nl> + <nl> tf_cc_test ( <nl> name = " debug_ops_test " , <nl> size = " small " , <nl> filegroup ( <nl> " function_ops . cc " , <nl> " gather_functor . h " , <nl> " gather_op . cc " , <nl> + " identity_n_op . cc " , <nl> + " identity_n_op . h " , <nl> " identity_op . cc " , <nl> " identity_op . h " , <nl> " immutable_constant_op . cc " , <nl> new file mode 100644 <nl> index 0000000000000 . . ccb23a4e65522 <nl> mmm / dev / null <nl> ppp b / tensorflow / core / kernels / identity_n_op . cc <nl> <nl> + / * Copyright 2015 - 2017 The TensorFlow Authors . All Rights Reserved . <nl> + <nl> + Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + you may not use this file except in compliance with the License . <nl> + You may obtain a copy of the License at <nl> + <nl> + http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + <nl> + Unless required by applicable law or agreed to in writing , software <nl> + distributed under the License is distributed on an " AS IS " BASIS , <nl> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + See the License for the specific language governing permissions and <nl> + limitations under the License . <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = * / <nl> + <nl> + / / See docs in . . / ops / array_ops . cc . <nl> + # include " tensorflow / core / kernels / identity_n_op . h " <nl> + <nl> + # include " tensorflow / core / framework / op_kernel . h " <nl> + # include " tensorflow / core / framework / register_types . h " <nl> + # include " tensorflow / core / framework / tensor . h " <nl> + # include " tensorflow / core / framework / types . h " <nl> + <nl> + namespace tensorflow { <nl> + <nl> + REGISTER_KERNEL_BUILDER ( Name ( " IdentityN " ) . Device ( DEVICE_CPU ) , IdentityNOp ) ; <nl> + <nl> + # if TENSORFLOW_USE_SYCL <nl> + REGISTER_KERNEL_BUILDER ( Name ( " IdentityN " ) . Device ( DEVICE_SYCL ) , IdentityNOp ) ; <nl> + # endif <nl> + <nl> + REGISTER_KERNEL_BUILDER ( Name ( " IdentityN " ) . Device ( DEVICE_GPU ) , IdentityNOp ) ; <nl> + <nl> + } / / namespace tensorflow <nl> new file mode 100644 <nl> index 0000000000000 . . 490bbf456c676 <nl> mmm / dev / null <nl> ppp b / tensorflow / core / kernels / identity_n_op . h <nl> <nl> + / * Copyright 2015 - 2017 The TensorFlow Authors . All Rights Reserved . <nl> + <nl> + Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + you may not use this file except in compliance with the License . <nl> + You may obtain a copy of the License at <nl> + <nl> + http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + <nl> + Unless required by applicable law or agreed to in writing , software <nl> + distributed under the License is distributed on an " AS IS " BASIS , <nl> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + See the License for the specific language governing permissions and <nl> + limitations under the License . <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = * / <nl> + <nl> + # ifndef TENSORFLOW_KERNELS_IDENTITY_N_OP_H_ <nl> + # define TENSORFLOW_KERNELS_IDENTITY_N_OP_H_ <nl> + <nl> + # include " tensorflow / core / framework / op_kernel . h " <nl> + <nl> + namespace tensorflow { <nl> + <nl> + class IdentityNOp : public OpKernel { <nl> + public : <nl> + explicit IdentityNOp ( OpKernelConstruction * context ) : OpKernel ( context ) { } <nl> + <nl> + void Compute ( OpKernelContext * context ) override { <nl> + OpInputList input ; <nl> + OpOutputList output ; <nl> + OP_REQUIRES_OK ( context , context - > input_list ( " input " , & input ) ) ; <nl> + OP_REQUIRES_OK ( context , context - > output_list ( " output " , & output ) ) ; <nl> + OP_REQUIRES ( context , input . size ( ) = = output . size ( ) , <nl> + errors : : InvalidArgument ( " Input and output counts must match " ) ) ; <nl> + for ( int i = 0 ; i < input . size ( ) ; + + i ) { <nl> + output . set ( i , input [ i ] ) ; <nl> + } <nl> + } <nl> + <nl> + bool IsExpensive ( ) override { return false ; } <nl> + } ; <nl> + <nl> + } / / namespace tensorflow <nl> + <nl> + # endif / / TENSORFLOW_KERNELS_IDENTITY_N_OP_H_ <nl> new file mode 100644 <nl> index 0000000000000 . . 6a133c4d03a22 <nl> mmm / dev / null <nl> ppp b / tensorflow / core / kernels / identity_n_op_test . cc <nl> <nl> + / * Copyright 2015 - 2017 The TensorFlow Authors . All Rights Reserved . <nl> + <nl> + Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + you may not use this file except in compliance with the License . <nl> + You may obtain a copy of the License at <nl> + <nl> + http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + <nl> + Unless required by applicable law or agreed to in writing , software <nl> + distributed under the License is distributed on an " AS IS " BASIS , <nl> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + See the License for the specific language governing permissions and <nl> + limitations under the License . <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = * / <nl> + <nl> + # include " tensorflow / core / framework / fake_input . h " <nl> + # include " tensorflow / core / framework / node_def_builder . h " <nl> + # include " tensorflow / core / framework / tensor . h " <nl> + # include " tensorflow / core / framework / tensor_testutil . h " <nl> + # include " tensorflow / core / framework / types . h " <nl> + # include " tensorflow / core / kernels / ops_testutil . h " <nl> + # include " tensorflow / core / kernels / ops_util . h " <nl> + # include " tensorflow / core / lib / strings / strcat . h " <nl> + # include " tensorflow / core / platform / test . h " <nl> + <nl> + namespace tensorflow { <nl> + namespace { <nl> + <nl> + class IdentityNOpTest : public OpsTestBase { <nl> + protected : <nl> + Status Init ( DataType input0_type , DataType input1_type ) { <nl> + TF_CHECK_OK ( NodeDefBuilder ( " op " , " IdentityN " ) <nl> + . Input ( FakeInput ( { input0_type , input1_type } ) ) <nl> + . Finalize ( node_def ( ) ) ) ; <nl> + return InitOp ( ) ; <nl> + } <nl> + } ; <nl> + <nl> + TEST_F ( IdentityNOpTest , Int32DoubleSuccess_6 ) { <nl> + TF_ASSERT_OK ( Init ( DT_INT32 , DT_DOUBLE ) ) ; <nl> + AddInputFromArray < int32 > ( TensorShape ( { 6 } ) , { 1 , 2 , 3 , 4 , 5 , 6 } ) ; <nl> + AddInputFromArray < double > ( TensorShape ( { 6 } ) , <nl> + { 7 . 3 , 8 . 3 , 9 . 3 , 10 . 3 , 11 . 3 , 12 . 3 } ) ; <nl> + TF_ASSERT_OK ( RunOpKernel ( ) ) ; <nl> + Tensor expected0 ( allocator ( ) , DT_INT32 , TensorShape ( { 6 } ) ) ; <nl> + test : : FillValues < int32 > ( & expected0 , { 1 , 2 , 3 , 4 , 5 , 6 } ) ; <nl> + test : : ExpectTensorEqual < int32 > ( expected0 , * GetOutput ( 0 ) ) ; <nl> + Tensor expected1 ( allocator ( ) , DT_DOUBLE , TensorShape ( { 6 } ) ) ; <nl> + test : : FillValues < double > ( & expected1 , { 7 . 3 , 8 . 3 , 9 . 3 , 10 . 3 , 11 . 3 , 12 . 3 } ) ; <nl> + test : : ExpectTensorEqual < double > ( expected1 , * GetOutput ( 1 ) ) ; <nl> + } <nl> + <nl> + TEST_F ( IdentityNOpTest , Int32Success_2_3 ) { <nl> + TF_ASSERT_OK ( Init ( DT_INT32 , DT_INT32 ) ) ; <nl> + AddInputFromArray < int32 > ( TensorShape ( { 2 , 3 } ) , { 1 , 2 , 3 , 4 , 5 , 6 } ) ; <nl> + AddInputFromArray < int32 > ( TensorShape ( { 2 , 3 } ) , { 7 , 8 , 9 , 10 , 11 , 12 } ) ; <nl> + TF_ASSERT_OK ( RunOpKernel ( ) ) ; <nl> + Tensor expected ( allocator ( ) , DT_INT32 , TensorShape ( { 2 , 3 } ) ) ; <nl> + test : : FillValues < int32 > ( & expected , { 1 , 2 , 3 , 4 , 5 , 6 } ) ; <nl> + test : : ExpectTensorEqual < int32 > ( expected , * GetOutput ( 0 ) ) ; <nl> + test : : FillValues < int32 > ( & expected , { 7 , 8 , 9 , 10 , 11 , 12 } ) ; <nl> + test : : ExpectTensorEqual < int32 > ( expected , * GetOutput ( 1 ) ) ; <nl> + } <nl> + <nl> + TEST_F ( IdentityNOpTest , StringInt32Success ) { <nl> + TF_ASSERT_OK ( Init ( DT_STRING , DT_INT32 ) ) ; <nl> + AddInputFromArray < string > ( TensorShape ( { 6 } ) , { " A " , " b " , " C " , " d " , " E " , " f " } ) ; <nl> + AddInputFromArray < int32 > ( TensorShape ( { 8 } ) , { 1 , 3 , 5 , 7 , 9 , 11 , 13 , 15 } ) ; <nl> + TF_ASSERT_OK ( RunOpKernel ( ) ) ; <nl> + Tensor expected0 ( allocator ( ) , DT_STRING , TensorShape ( { 6 } ) ) ; <nl> + test : : FillValues < string > ( & expected0 , { " A " , " b " , " C " , " d " , " E " , " f " } ) ; <nl> + test : : ExpectTensorEqual < string > ( expected0 , * GetOutput ( 0 ) ) ; <nl> + Tensor expected1 ( allocator ( ) , DT_INT32 , TensorShape ( { 8 } ) ) ; <nl> + test : : FillValues < int32 > ( & expected1 , { 1 , 3 , 5 , 7 , 9 , 11 , 13 , 15 } ) ; <nl> + test : : ExpectTensorEqual < int32 > ( expected1 , * GetOutput ( 1 ) ) ; <nl> + } <nl> + <nl> + } / / namespace <nl> + } / / namespace tensorflow <nl> mmm a / tensorflow / core / ops / array_ops . cc <nl> ppp b / tensorflow / core / ops / array_ops . cc <nl> REGISTER_OP ( " _MklIdentity " ) <nl> ) Doc " ) ; <nl> # endif <nl> <nl> + REGISTER_OP ( " IdentityN " ) <nl> + . Input ( " input : T " ) <nl> + . Output ( " output : T " ) <nl> + . Attr ( " T : list ( type ) " ) <nl> + . SetShapeFn ( [ ] ( shape_inference : : InferenceContext * c ) { <nl> + std : : vector < ShapeHandle > input ; <nl> + TF_RETURN_IF_ERROR ( c - > input ( " input " , & input ) ) ; <nl> + TF_RETURN_IF_ERROR ( c - > set_output ( " output " , input ) ) ; <nl> + return Status : : OK ( ) ; <nl> + } ) <nl> + . Doc ( R " Doc ( <nl> + Returns a list of tensors with the same shapes and contents as the input <nl> + tensors . <nl> + <nl> + This op can be used to override the gradient for complicated functions . For <nl> + example , suppose y = f ( x ) and we wish to apply a custom function g for backprop <nl> + such that dx = g ( dy ) . In Python , <nl> + <nl> + ` ` ` python <nl> + with tf . get_default_graph ( ) . gradient_override_map ( <nl> + { ' IdentityN ' : ' OverrideGradientWithG ' } ) : <nl> + y , _ = identity_n ( [ f ( x ) , x ] ) <nl> + <nl> + @ tf . RegisterGradient ( ' OverrideGradientWithG ' ) <nl> + def ApplyG ( op , dy , _ ) : <nl> + return [ None , g ( dy ) ] # Do not backprop to f ( x ) . <nl> + ` ` ` <nl> + ) Doc " ) ; <nl> + <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - - <nl> REGISTER_OP ( " RefIdentity " ) <nl> . Input ( " input : Ref ( T ) " ) <nl> mmm a / tensorflow / python / kernel_tests / BUILD <nl> ppp b / tensorflow / python / kernel_tests / BUILD <nl> tf_py_test ( <nl> ] , <nl> ) <nl> <nl> + tf_py_test ( <nl> + name = " identity_n_op_py_test " , <nl> + size = " small " , <nl> + srcs = [ " identity_n_op_py_test . py " ] , <nl> + additional_deps = [ <nl> + " / / third_party / py / numpy " , <nl> + " / / tensorflow / python : array_ops " , <nl> + " / / tensorflow / python : array_ops_gen " , <nl> + " / / tensorflow / python : client_testlib " , <nl> + " / / tensorflow / python : framework_for_generated_wrappers " , <nl> + " / / tensorflow / python : variables " , <nl> + ] , <nl> + ) <nl> + <nl> tf_py_test ( <nl> name = " in_topk_op_test " , <nl> size = " small " , <nl> new file mode 100644 <nl> index 0000000000000 . . 408b17398104d <nl> mmm / dev / null <nl> ppp b / tensorflow / python / kernel_tests / identity_n_op_py_test . py <nl> <nl> + # Copyright 2015 The TensorFlow Authors . All Rights Reserved . <nl> + # <nl> + # Licensed under the Apache License , Version 2 . 0 ( the " License " ) ; <nl> + # you may not use this file except in compliance with the License . <nl> + # You may obtain a copy of the License at <nl> + # <nl> + # http : / / www . apache . org / licenses / LICENSE - 2 . 0 <nl> + # <nl> + # Unless required by applicable law or agreed to in writing , software <nl> + # distributed under the License is distributed on an " AS IS " BASIS , <nl> + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND , either express or implied . <nl> + # See the License for the specific language governing permissions and <nl> + # limitations under the License . <nl> + # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + " " " Tests for IdentityNOp . " " " <nl> + <nl> + from __future__ import absolute_import <nl> + from __future__ import division <nl> + from __future__ import print_function <nl> + <nl> + import numpy as np <nl> + <nl> + from tensorflow . python . framework import constant_op <nl> + from tensorflow . python . ops import array_ops <nl> + from tensorflow . python . platform import test <nl> + <nl> + <nl> + class IdentityNOpTest ( test . TestCase ) : <nl> + <nl> + def testInt32String_6 ( self ) : <nl> + with self . test_session ( ) as sess : <nl> + [ value0 , value1 ] = sess . run ( <nl> + array_ops . identity_n ( [ [ 1 , 2 , 3 , 4 , 5 , 6 ] , <nl> + [ b " a " , b " b " , b " C " , b " d " , b " E " , b " f " , b " g " ] ] ) ) <nl> + self . assertAllEqual ( np . array ( [ 1 , 2 , 3 , 4 , 5 , 6 ] ) , value0 ) <nl> + self . assertAllEqual ( <nl> + np . array ( [ b " a " , b " b " , b " C " , b " d " , b " E " , b " f " , b " g " ] ) , value1 ) <nl> + <nl> + def testInt32_shapes ( self ) : <nl> + with self . test_session ( ) as sess : <nl> + inp0 = constant_op . constant ( [ 10 , 20 , 30 , 40 , 50 , 60 ] , shape = [ 2 , 3 ] ) <nl> + inp1 = constant_op . constant ( [ 11 , 21 , 31 , 41 , 51 , 61 ] , shape = [ 3 , 2 ] ) <nl> + inp2 = constant_op . constant ( <nl> + [ 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 15 ] , shape = [ 5 , 3 ] ) <nl> + [ value0 , value1 , <nl> + value2 ] = sess . run ( array_ops . identity_n ( [ inp0 , inp1 , inp2 ] ) ) <nl> + self . assertAllEqual ( np . array ( [ [ 10 , 20 , 30 ] , [ 40 , 50 , 60 ] ] ) , value0 ) <nl> + self . assertAllEqual ( np . array ( [ [ 11 , 21 ] , [ 31 , 41 ] , [ 51 , 61 ] ] ) , value1 ) <nl> + self . assertAllEqual ( <nl> + np . array ( [ [ 1 , 2 , 3 ] , [ 4 , 5 , 6 ] , [ 7 , 8 , 9 ] , [ 10 , 11 , 12 ] , [ 13 , 14 , 15 ] ] ) , <nl> + value2 ) <nl> + <nl> + def testString ( self ) : <nl> + source = [ b " A " , b " b " , b " C " , b " d " , b " E " , b " f " ] <nl> + with self . test_session ( ) as sess : <nl> + [ value ] = sess . run ( array_ops . identity_n ( [ source ] ) ) <nl> + self . assertAllEqual ( source , value ) <nl> + <nl> + def testIdentityShape ( self ) : <nl> + with self . test_session ( ) : <nl> + shape = [ 2 , 3 ] <nl> + array_2x3 = [ [ 1 , 2 , 3 ] , [ 6 , 5 , 4 ] ] <nl> + tensor = constant_op . constant ( array_2x3 ) <nl> + self . assertEquals ( shape , tensor . get_shape ( ) ) <nl> + self . assertEquals ( shape , array_ops . identity_n ( [ tensor ] ) [ 0 ] . get_shape ( ) ) <nl> + self . assertEquals ( shape , array_ops . identity_n ( [ array_2x3 ] ) [ 0 ] . get_shape ( ) ) <nl> + <nl> + <nl> + if __name__ = = " __main__ " : <nl> + test . main ( ) <nl> mmm a / tensorflow / python / ops / array_grad . py <nl> ppp b / tensorflow / python / ops / array_grad . py <nl> def _RefIdGrad ( _ , grad ) : <nl> return grad <nl> <nl> <nl> + @ ops . RegisterGradient ( " IdentityN " ) <nl> + def _IdNGrad ( _ , * grad ) : <nl> + return grad <nl> + <nl> + <nl> ops . NotDifferentiable ( " StopGradient " ) <nl> <nl> <nl> mmm a / tensorflow / python / ops / control_flow_ops . py <nl> ppp b / tensorflow / python / ops / control_flow_ops . py <nl> <nl> See the @ { $ python / control_flow_ops } guide . <nl> <nl> @ @ identity <nl> + @ @ identity_n <nl> @ @ tuple <nl> @ @ group <nl> @ @ no_op <nl> mmm a / tensorflow / tools / api / golden / tensorflow . pbtxt <nl> ppp b / tensorflow / tools / api / golden / tensorflow . pbtxt <nl> tf_module { <nl> name : " identity " <nl> argspec : " args = [ \ ' input \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> } <nl> + member_method { <nl> + name : " identity_n " <nl> + argspec : " args = [ \ ' input \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl> + } <nl> member_method { <nl> name : " ifft " <nl> argspec : " args = [ \ ' input \ ' , \ ' name \ ' ] , varargs = None , keywords = None , defaults = [ \ ' None \ ' ] , " <nl>
|
Added n - input , n - output identity op for CPU and GPU .
|
tensorflow/tensorflow
|
274a36e7b7d52e040d89bd784e74e0f8da199e36
|
2017-08-04T02:12:17Z
|
mmm a / xbmc / windowing / windows / WinEventsWin32 . cpp <nl> ppp b / xbmc / windowing / windows / WinEventsWin32 . cpp <nl> void CWinEventsWin32 : : OnGestureNotify ( HWND hWnd , LPARAM lParam ) <nl> gc [ 1 ] . dwWant | = GC_ROTATE ; <nl> if ( gestures = = EVENT_RESULT_PAN_VERTICAL ) <nl> gc [ 2 ] . dwWant | = GC_PAN_WITH_SINGLE_FINGER_VERTICALLY | GC_PAN_WITH_GUTTER | GC_PAN_WITH_INERTIA ; <nl> - if ( gestures = = EVENT_RESULT_PAN_VERTICAL_WITHOUT_INERTIAL ) <nl> + if ( gestures = = EVENT_RESULT_PAN_VERTICAL_WITHOUT_INERTIA ) <nl> gc [ 2 ] . dwWant | = GC_PAN_WITH_SINGLE_FINGER_VERTICALLY ; <nl> if ( gestures = = EVENT_RESULT_PAN_HORIZONTAL ) <nl> gc [ 2 ] . dwWant | = GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY | GC_PAN_WITH_GUTTER | GC_PAN_WITH_INERTIA ; <nl> - if ( gestures = = EVENT_RESULT_PAN_HORIZONTAL_WITHOUT_INERTIALL ) <nl> + if ( gestures = = EVENT_RESULT_PAN_HORIZONTAL_WITHOUT_INERTIA ) <nl> gc [ 2 ] . dwWant | = GC_PAN_WITH_SINGLE_FINGER_HORIZONTALLY ; <nl> gc [ 0 ] . dwBlock = gc [ 0 ] . dwWant ^ 1 ; <nl> gc [ 1 ] . dwBlock = gc [ 1 ] . dwWant ^ 1 ; <nl>
|
[ WIN ] fix build , a couple subsitutions missed in 43a53ae8
|
xbmc/xbmc
|
dab646e54a07cf686b40377636d47d37869ee9f6
|
2011-09-26T23:43:14Z
|
mmm a / src / mongo / db / s / SConscript <nl> ppp b / src / mongo / db / s / SConscript <nl> env . Library ( <nl> ' sharding_statistics . cpp ' , <nl> ' split_chunk . cpp ' , <nl> ' split_vector . cpp ' , <nl> + env . Idlc ( ' sharding_runtime_d_params . idl ' ) [ 0 ] , <nl> ] , <nl> LIBDEPS = [ <nl> ' $ BUILD_DIR / mongo / db / catalog / multi_index_block ' , <nl> env . Library ( <nl> ] , <nl> LIBDEPS_PRIVATE = [ <nl> ' $ BUILD_DIR / mongo / db / session_catalog ' , <nl> + ' $ BUILD_DIR / mongo / idl / server_parameter ' , <nl> ] , <nl> ) <nl> <nl> mmm a / src / mongo / db / s / collection_range_deleter . cpp <nl> ppp b / src / mongo / db / s / collection_range_deleter . cpp <nl> <nl> # include " mongo / db / query / query_planner . h " <nl> # include " mongo / db / repl / repl_client_info . h " <nl> # include " mongo / db / s / collection_sharding_runtime . h " <nl> + # include " mongo / db / s / sharding_runtime_d_params_gen . h " <nl> # include " mongo / db / s / sharding_state . h " <nl> # include " mongo / db / s / sharding_statistics . h " <nl> - # include " mongo / db / server_parameters . h " <nl> # include " mongo / db / service_context . h " <nl> # include " mongo / db / storage / remove_saver . h " <nl> # include " mongo / db / write_concern . h " <nl> <nl> <nl> namespace mongo { <nl> <nl> - MONGO_EXPORT_SERVER_PARAMETER ( rangeDeleterBatchSize , int , 0 ) <nl> - - > withValidator ( [ ] ( const int & newVal ) { <nl> - if ( newVal < 0 ) { <nl> - return Status ( ErrorCodes : : BadValue , " rangeDeleterBatchSize must not be negative " ) ; <nl> - } <nl> - return Status : : OK ( ) ; <nl> - } ) ; <nl> - <nl> - MONGO_EXPORT_SERVER_PARAMETER ( rangeDeleterBatchDelayMS , int , 20 ) <nl> - - > withValidator ( [ ] ( const int & newVal ) { <nl> - if ( newVal < 0 ) { <nl> - return Status ( ErrorCodes : : BadValue , " rangeDeleterBatchDelayMS must not be negative " ) ; <nl> - } <nl> - return Status : : OK ( ) ; <nl> - } ) ; <nl> - <nl> namespace { <nl> <nl> using Deletion = CollectionRangeDeleter : : Deletion ; <nl> mmm a / src / mongo / db / s / collection_sharding_runtime . cpp <nl> ppp b / src / mongo / db / s / collection_sharding_runtime . cpp <nl> <nl> <nl> # include " mongo / base / checked_cast . h " <nl> # include " mongo / db / catalog_raii . h " <nl> - # include " mongo / db / server_parameters . h " <nl> + # include " mongo / db / s / sharding_runtime_d_params_gen . h " <nl> # include " mongo / util / duration . h " <nl> # include " mongo / util / log . h " <nl> <nl> namespace mongo { <nl> <nl> - MONGO_EXPORT_SERVER_PARAMETER ( migrationLockAcquisitionMaxWaitMS , int , 500 ) ; <nl> - <nl> namespace { <nl> <nl> - / / How long to wait before starting cleanup of an emigrated chunk range <nl> - MONGO_EXPORT_SERVER_PARAMETER ( orphanCleanupDelaySecs , int , 900 ) ; / / 900s = 15m <nl> - <nl> / * * <nl> * Returns whether the specified namespace is used for sharding - internal purposes only and can never <nl> * be marked as anything other than UNSHARDED , because the call sites which reference these <nl> mmm a / src / mongo / db / s / migration_destination_manager . cpp <nl> ppp b / src / mongo / db / s / migration_destination_manager . cpp <nl> <nl> # include " mongo / db / s / collection_sharding_state . h " <nl> # include " mongo / db / s / migration_util . h " <nl> # include " mongo / db / s / move_timing_helper . h " <nl> + # include " mongo / db / s / sharding_runtime_d_params_gen . h " <nl> # include " mongo / db / s / sharding_statistics . h " <nl> # include " mongo / db / s / start_chunk_clone_request . h " <nl> - # include " mongo / db / server_parameters . h " <nl> # include " mongo / db / service_context . h " <nl> # include " mongo / db / storage / remove_saver . h " <nl> # include " mongo / s / catalog / type_chunk . h " <nl> void MigrationDestinationManager : : _migrateThread ( ) { <nl> _isActiveCV . notify_all ( ) ; <nl> } <nl> <nl> - / / The maximum number of documents to insert in a single batch during migration clone . <nl> - / / secondaryThrottle and migrateCloneInsertionBatchDelayMS apply between each batch . <nl> - / / 0 or negative values ( the default ) means no limit to batch size . <nl> - / / 1 corresponds to 3 . 4 . 16 ( and earlier ) behavior . <nl> - MONGO_EXPORT_SERVER_PARAMETER ( migrateCloneInsertionBatchSize , int , 0 ) <nl> - - > withValidator ( [ ] ( const int & newVal ) { <nl> - if ( newVal < 0 ) { <nl> - return Status ( ErrorCodes : : BadValue , <nl> - " migrateCloneInsertionBatchSize must not be negative " ) ; <nl> - } <nl> - return Status : : OK ( ) ; <nl> - } ) ; <nl> - <nl> - / / Time in milliseconds between batches of insertions during migration clone . <nl> - / / This is in addition to any time spent waiting for replication ( secondaryThrottle ) . <nl> - / / Defaults to 0 , which means no wait . <nl> - MONGO_EXPORT_SERVER_PARAMETER ( migrateCloneInsertionBatchDelayMS , int , 0 ) <nl> - - > withValidator ( [ ] ( const int & newVal ) { <nl> - if ( newVal < 0 ) { <nl> - return Status ( ErrorCodes : : BadValue , <nl> - " migrateCloneInsertionBatchDelayMS must not be negative " ) ; <nl> - } <nl> - return Status : : OK ( ) ; <nl> - } ) ; <nl> - <nl> void MigrationDestinationManager : : _migrateDriver ( OperationContext * opCtx ) { <nl> invariant ( isActive ( ) ) ; <nl> invariant ( _sessionId ) ; <nl> new file mode 100644 <nl> index 000000000000 . . 44f808d412a2 <nl> mmm / dev / null <nl> ppp b / src / mongo / db / s / sharding_runtime_d_params . idl <nl> <nl> + # Copyright ( C ) 2019 - present MongoDB , Inc . <nl> + # <nl> + # This program is free software : you can redistribute it and / or modify <nl> + # it under the terms of the Server Side Public License , version 1 , <nl> + # as published by MongoDB , Inc . <nl> + # <nl> + # This program is distributed in the hope that it will be useful , <nl> + # but WITHOUT ANY WARRANTY ; without even the implied warranty of <nl> + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE . See the <nl> + # Server Side Public License for more details . <nl> + # <nl> + # You should have received a copy of the Server Side Public License <nl> + # along with this program . If not , see <nl> + # < http : / / www . mongodb . com / licensing / server - side - public - license > . <nl> + # <nl> + # As a special exception , the copyright holders give permission to link the <nl> + # code of portions of this program with the OpenSSL library under certain <nl> + # conditions as described in each individual source file and distribute <nl> + # linked combinations including the program with the OpenSSL library . You <nl> + # must comply with the Server Side Public License in all respects for <nl> + # all of the code used other than as permitted herein . If you modify file ( s ) <nl> + # with this exception , you may extend this exception to your version of the <nl> + # file ( s ) , but you are not obligated to do so . If you do not wish to do so , <nl> + # delete this exception statement from your version . If you delete this <nl> + # exception statement from all source files in the program , then also delete <nl> + # it in the license file . <nl> + <nl> + global : <nl> + cpp_namespace : mongo <nl> + <nl> + server_parameters : <nl> + rangeDeleterBatchSize : <nl> + description : > - <nl> + The maximum number of documents in each batch to delete during the cleanup stage of chunk <nl> + migration ( or the cleanupOrphaned command ) . The default value of 0 indicates that the <nl> + system chooses an appropriate value , generally 128 documents . <nl> + set_at : [ startup , runtime ] <nl> + cpp_vartype : AtomicWord < int > <nl> + cpp_varname : rangeDeleterBatchSize <nl> + validator : <nl> + gte : 0 <nl> + default : 0 <nl> + <nl> + rangeDeleterBatchDelayMS : <nl> + description : > - <nl> + The amount of time in milliseconds to wait before the next batch of deletion during the <nl> + cleanup stage of chunk migration ( or the cleanupOrphaned command ) . <nl> + set_at : [ startup , runtime ] <nl> + cpp_vartype : AtomicWord < int > <nl> + cpp_varname : rangeDeleterBatchDelayMS <nl> + validator : <nl> + gte : 0 <nl> + default : 20 <nl> + <nl> + migrateCloneInsertionBatchSize : <nl> + description : > - <nl> + The maximum number of documents to insert in a single batch during the cloning step of <nl> + the migration process . The default value of 0 indicates no maximum number of documents <nl> + per batch . However , in practice , this results in batches that contain up to 16 MB of <nl> + documents . The value 1 corresponds to MongoDB 3 . 4 . 16 ( and earlier ) behavior . <nl> + set_at : [ startup , runtime ] <nl> + cpp_vartype : AtomicWord < int > <nl> + cpp_varname : migrateCloneInsertionBatchSize <nl> + validator : <nl> + gte : 0 <nl> + default : 0 <nl> + <nl> + migrateCloneInsertionBatchDelayMS : <nl> + description : > - <nl> + Time in milliseconds to wait between batches of insertions during cloning step of the <nl> + migration process . This wait is in addition to the secondaryThrottle . The default value <nl> + of 0 indicates no additional wait . <nl> + set_at : [ startup , runtime ] <nl> + cpp_vartype : AtomicWord < int > <nl> + cpp_varname : migrateCloneInsertionBatchDelayMS <nl> + validator : <nl> + gte : 0 <nl> + default : 0 <nl> + <nl> + migrationLockAcquisitionMaxWaitMS : <nl> + description : ' How long to wait to acquire collection lock for migration related operations . ' <nl> + set_at : [ startup , runtime ] <nl> + cpp_vartype : AtomicWord < int > <nl> + cpp_varname : migrationLockAcquisitionMaxWaitMS <nl> + default : 500 <nl> + <nl> + orphanCleanupDelaySecs : <nl> + description : ' How long to wait before starting cleanup of an emigrated chunk range . ' <nl> + set_at : [ startup , runtime ] <nl> + cpp_vartype : AtomicWord < int > <nl> + cpp_varname : orphanCleanupDelaySecs <nl> + default : 900 <nl>
|
SERVER - 39635 SERVER - 39636 SERVER - 39637 SERVER - 39640 IDL ' ify server parameters in sharding_runtime_d_params .
|
mongodb/mongo
|
d53ffb71121f8b09c09768e85420d6836247bf47
|
2019-02-25T15:49:55Z
|
mmm a / modules / dreamview / backend / point_cloud / BUILD <nl> ppp b / modules / dreamview / backend / point_cloud / BUILD <nl> cc_library ( <nl> hdrs = [ <nl> " point_cloud_updater . h " , <nl> ] , <nl> - copts = [ ' - DMODULE_NAME = \ \ " dreamview \ \ " ' ] , <nl> - linkopts = [ <nl> - " - lboost_thread " , <nl> - ] , <nl> deps = [ <nl> " / / cyber " , <nl> " / / modules / common / adapters : adapter_gflags " , <nl> cc_library ( <nl> " / / modules / drivers / proto : sensor_proto " , <nl> " / / modules / localization / proto : localization_proto " , <nl> " / / third_party / json " , <nl> + " @ boost " , <nl> " @ com_google_protobuf / / : protobuf " , <nl> " @ pcl " , <nl> " @ yaml_cpp / / : yaml " , <nl>
|
dreamview : update boost dependency config .
|
ApolloAuto/apollo
|
84ce3310c4e058fb79cf3ccb7437f28ac858fa88
|
2019-08-14T04:17:06Z
|
mmm a / aten / src / ATen / SparseTensorRef . h <nl> ppp b / aten / src / ATen / SparseTensorRef . h <nl> <nl> namespace at { <nl> <nl> struct Tensor ; <nl> - struct SparseTensor { <nl> - explicit SparseTensor ( const Tensor & t ) : tref ( t ) { } <nl> + struct SparseTensorRef { <nl> + explicit SparseTensorRef ( const Tensor & t ) : tref ( t ) { } <nl> const Tensor & tref ; <nl> } ; <nl> <nl> mmm a / aten / src / ATen / function_wrapper . py <nl> ppp b / aten / src / ATen / function_wrapper . py <nl> def __init__ ( self , reason ) : <nl> <nl> TYPE_FORMAL_GENERIC = { <nl> ' THTensor * ' : ' Tensor & ' , <nl> - ' THSTensor * ' : ' SparseTensor ' , <nl> + ' THSTensor * ' : ' SparseTensorRef ' , <nl> ' THBoolTensor * ' : ' Tensor & ' , <nl> ' THIndexTensor * ' : ' Tensor & ' , <nl> ' THIntegerTensor * ' : ' Tensor & ' , <nl> def __init__ ( self , reason ) : <nl> <nl> DYNAMIC_TYPE = { <nl> ' THTensor * ' : ' Tensor ' , <nl> - ' THSTensor * ' : ' SparseTensor ' , <nl> + ' THSTensor * ' : ' SparseTensorRef ' , <nl> ' THBoolTensor * ' : ' BoolTensor ' , <nl> ' THIndexTensor * ' : ' IndexTensor ' , <nl> ' THIntegerTensor * ' : ' IntegerTensor ' , <nl> def handle_sparse ( env , option ) : <nl> return [ ] <nl> check_name = option [ ' when_sparse_dispatch ' ] <nl> sparse_actuals = [ arg [ ' name ' ] <nl> - if arg [ ' name ' ] ! = check_name else " SparseTensor ( { } ) " . format ( arg [ ' name ' ] ) <nl> + if arg [ ' name ' ] ! = check_name else " SparseTensorRef ( { } ) " . format ( arg [ ' name ' ] ) <nl> for arg in option [ ' formals_list ' ] ] <nl> return [ SPARSE_CHECK . substitute ( env , check_name = check_name , sparse_actuals = sparse_actuals ) ] <nl> <nl> mmm a / tools / autograd / derivatives . yaml <nl> ppp b / tools / autograd / derivatives . yaml <nl> <nl> - name : zero_ ( Tensor self ) <nl> self : zeros_like ( grad ) <nl> <nl> - - name : _sparse_mask ( Tensor self , SparseTensor mask ) <nl> + - name : _sparse_mask ( Tensor self , SparseTensorRef mask ) <nl> self : not_implemented ( " _sparse_mask " ) <nl> mask : not_implemented ( " _sparse_mask " ) <nl> <nl> mmm a / tools / autograd / gen_python_functions . py <nl> ppp b / tools / autograd / gen_python_functions . py <nl> def should_generate_python_binding ( declaration ) : <nl> return False <nl> <nl> # TODO : fix handling of SparseTensor . We don ' t want to generate Python <nl> - # bindings to SparseTensor overloads , such as add ( Tensor , SparseTensor ) , <nl> + # bindings to SparseTensor overloads , such as add ( Tensor , SparseTensorRef ) , <nl> # since the Tensor - based signature already dynamically dispatches correctly . <nl> # However , _sparse_mask only has a SparseTensor signature so we need to bind <nl> # that function . <nl> for arg in declaration [ ' arguments ' ] : <nl> - if arg [ ' type ' ] = = ' SparseTensor ' and declaration [ ' name ' ] ! = ' _sparse_mask ' : <nl> + if arg [ ' type ' ] = = ' SparseTensorRef ' and declaration [ ' name ' ] ! = ' _sparse_mask ' : <nl> return False <nl> <nl> return True <nl> def create_python_bindings ( python_functions , has_self , is_module = False ) : <nl> <nl> unpack_methods = { <nl> ' const Tensor & ' : ' tensor ' , <nl> - ' SparseTensor ' : ' tensor ' , <nl> + ' SparseTensorRef ' : ' tensor ' , <nl> ' Tensor & ' : ' tensor ' , <nl> ' Generator * ' : ' generator ' , <nl> ' Storage & ' : ' storage ' , <nl> def parse_arg ( arg , arg_index , unpack_args = False ) : <nl> <nl> if typename = = ' Storage & ' : <nl> expr = ' * ' + expr <nl> - if typename = = ' SparseTensor ' : <nl> - expr = ' SparseTensor ( { } ) ' . format ( expr ) <nl> + if typename = = ' SparseTensorRef ' : <nl> + expr = ' SparseTensorRef ( { } ) ' . format ( expr ) <nl> <nl> dispatch_type = typename <nl> if dispatch_type = = ' Tensor ' : <nl> def process_function ( name , declarations ) : <nl> if not has_self : <nl> # Use ' input ' instead of ' self ' for NN functions <nl> signature = signature . replace ( ' Tensor self ' , ' Tensor input ' ) <nl> - signature = signature . replace ( ' SparseTensor ' , ' Tensor ' ) <nl> + signature = signature . replace ( ' SparseTensorRef ' , ' Tensor ' ) <nl> if dictionary [ ' base ' ] . get ( ' deprecated ' , False ) : <nl> signature + = ' | deprecated ' <nl> env [ ' signatures ' ] . append ( ' " { } " , ' . format ( signature ) ) <nl> mmm a / tools / autograd / gen_variable_type . py <nl> ppp b / tools / autograd / gen_variable_type . py <nl> def save_variables ( saved_variables , is_output ) : <nl> def reference_args ( args ) : <nl> res = [ ] <nl> for arg in args : <nl> - if arg [ ' type ' ] = = ' SparseTensor ' : <nl> + if arg [ ' type ' ] = = ' SparseTensorRef ' : <nl> res . append ( ' { } . tref ' . format ( arg [ ' name ' ] ) ) <nl> else : <nl> res . append ( arg [ ' name ' ] ) <nl> def requires_unpack ( arg ) : <nl> <nl> dynamic_type = arg [ ' dynamic_type ' ] <nl> is_nullable = arg . get ( ' is_nullable ' , False ) <nl> - ref = ( not is_nullable ) and dynamic_type not in [ ' TensorList ' , ' SparseTensor ' ] <nl> + ref = ( not is_nullable ) and dynamic_type not in [ ' TensorList ' , ' SparseTensorRef ' ] <nl> suffix = ' _opt ' if is_nullable else ' ' <nl> <nl> body . append ( UNPACK_TENSOR . substitute ( <nl> mmm a / tools / autograd / templates / VariableType . cpp <nl> ppp b / tools / autograd / templates / VariableType . cpp <nl> namespace torch { namespace autograd { <nl> / / don ' t want to make the codegen do the dispatch manually ) <nl> static void setattr ( jit : : Node * n , jit : : Symbol name , int64_t v ) { n - > i_ ( name , v ) ; } <nl> static void setattr ( jit : : Node * n , jit : : Symbol name , const at : : Scalar & v ) { n - > t_ ( name , v . toTensor ( ) ) ; } <nl> - static void setattr ( jit : : Node * n , jit : : Symbol name , SparseTensor s ) { n - > t_ ( name , s . tref ) ; } <nl> + static void setattr ( jit : : Node * n , jit : : Symbol name , SparseTensorRef s ) { n - > t_ ( name , s . tref ) ; } <nl> static void setattr ( jit : : Node * n , jit : : Symbol name , const at : : IntList & v ) { n - > is_ ( name , v ) ; } <nl> static void setattr ( jit : : Node * n , jit : : Symbol name , bool v ) { n - > i_ ( name , v ) ; } <nl> static void setattr ( jit : : Node * n , jit : : Symbol name , double v ) { n - > f_ ( name , v ) ; } <nl> void failPositionalAttr ( ) { <nl> <nl> static void setposattr ( jit : : Node * n , size_t idx , const char * name , int64_t v ) { genericInsertInput ( n , idx , v ) ; } <nl> static void setposattr ( jit : : Node * n , size_t idx , const char * name , const at : : Scalar & v ) { genericInsertInput ( n , idx , v ) ; } <nl> - static void setposattr ( jit : : Node * n , size_t idx , const char * name , SparseTensor s ) { failPositionalAttr ( ) ; } <nl> + static void setposattr ( jit : : Node * n , size_t idx , const char * name , SparseTensorRef s ) { failPositionalAttr ( ) ; } <nl> static void setposattr ( jit : : Node * n , size_t idx , const char * name , const at : : IntList & v ) { <nl> using ArgumentStash = jit : : tracer : : ArgumentStash ; <nl> if ( ArgumentStash : : hasIntList ( name ) ) { <nl> Tensor & VariableType : : unpack ( const Tensor & t , const char * name , int pos ) { <nl> return checked_cast_variable ( t , name , pos ) . data ( ) ; <nl> } <nl> <nl> - SparseTensor VariableType : : unpack ( SparseTensor t , const char * name , int pos ) { <nl> - return SparseTensor ( checked_cast_variable ( t . tref , name , pos ) . data ( ) ) ; <nl> + SparseTensorRef VariableType : : unpack ( SparseTensorRef t , const char * name , int pos ) { <nl> + return SparseTensorRef ( checked_cast_variable ( t . tref , name , pos ) . data ( ) ) ; <nl> } <nl> <nl> Tensor VariableType : : unpack_opt ( const Tensor & t , const char * name , int pos ) { <nl> mmm a / tools / autograd / templates / VariableType . h <nl> ppp b / tools / autograd / templates / VariableType . h <nl> using at : : Context ; <nl> using at : : Generator ; <nl> using at : : IntList ; <nl> using at : : Scalar ; <nl> - using at : : SparseTensor ; <nl> + using at : : SparseTensorRef ; <nl> using at : : Storage ; <nl> using at : : Tensor ; <nl> using at : : TensorList ; <nl> struct VariableType final : public at : : Type { <nl> / / checks that t is actually a Variable <nl> static Variable & checked_cast_variable ( const Tensor & t , const char * name , int pos ) ; <nl> static at : : Tensor & unpack ( const Tensor & t , const char * name , int pos ) ; <nl> - static at : : SparseTensor unpack ( SparseTensor t , const char * name , int pos ) ; <nl> + static at : : SparseTensorRef unpack ( SparseTensorRef t , const char * name , int pos ) ; <nl> static at : : Tensor unpack_opt ( const Tensor & t , const char * name , int pos ) ; <nl> static std : : vector < at : : Tensor > unpack ( at : : TensorList tl , const char * name , int pos ) ; <nl> <nl> mmm a / tools / autograd / templates / python_torch_functions_dispatch . h <nl> ppp b / tools / autograd / templates / python_torch_functions_dispatch . h <nl> using at : : Scalar ; <nl> using at : : TensorList ; <nl> using at : : IntList ; <nl> using at : : Generator ; <nl> - using at : : SparseTensor ; <nl> + using at : : SparseTensorRef ; <nl> using at : : Storage ; <nl> <nl> static at : : Type & default_type ( ) { <nl> mmm a / tools / autograd / templates / python_variable_methods_dispatch . h <nl> ppp b / tools / autograd / templates / python_variable_methods_dispatch . h <nl> using at : : Scalar ; <nl> using at : : TensorList ; <nl> using at : : IntList ; <nl> using at : : Generator ; <nl> - using at : : SparseTensor ; <nl> + using at : : SparseTensorRef ; <nl> using at : : Storage ; <nl> <nl> $ { py_method_dispatch } <nl> mmm a / tools / jit / gen_jit_dispatch . py <nl> ppp b / tools / jit / gen_jit_dispatch . py <nl> def is_magic_method ( api_name ) : <nl> return api_name . startswith ( ' __ ' ) and api_name . endswith ( ' __ ' ) <nl> <nl> <nl> - blacklisted_types = { ' SparseTensor ' , ' Storage ' , ' ScalarType ' , ' optional < ScalarType > ' , ' std : : string ' } <nl> + blacklisted_types = { ' SparseTensorRef ' , ' Storage ' , ' ScalarType ' , ' optional < ScalarType > ' , ' std : : string ' } <nl> default_only_types = { ' Generator ' } <nl> <nl> <nl>
|
Rename SparseTensor to SparseTensorRef . ( )
|
pytorch/pytorch
|
7ed361a466f1652ce23d1b196287f5ce4e066add
|
2018-06-07T15:03:49Z
|
mmm a / src / qt / addressbookpage . cpp <nl> ppp b / src / qt / addressbookpage . cpp <nl> void AddressBookPage : : done ( int retval ) <nl> void AddressBookPage : : on_exportButton_clicked ( ) <nl> { <nl> / / CSV is currently the only supported format <nl> - QString filename = GUIUtil : : getSaveFileName ( <nl> - this , <nl> - tr ( " Export Address List " ) , QString ( ) , <nl> - tr ( " Comma separated file ( * . csv ) " ) ) ; <nl> + QString filename = GUIUtil : : getSaveFileName ( this , <nl> + tr ( " Export Address List " ) , QString ( ) , <nl> + tr ( " Comma separated file ( * . csv ) " ) , NULL ) ; <nl> <nl> if ( filename . isNull ( ) ) return ; <nl> <nl> mmm a / src / qt / guiutil . h <nl> ppp b / src / qt / guiutil . h <nl> namespace GUIUtil <nl> @ param [ out ] selectedSuffixOut Pointer to return the suffix ( file type ) that was selected ( or 0 ) . <nl> Can be useful when choosing the save file format based on suffix . <nl> * / <nl> - QString getSaveFileName ( QWidget * parent = 0 , const QString & caption = QString ( ) , <nl> - const QString & dir = QString ( ) , const QString & filter = QString ( ) , <nl> - QString * selectedSuffixOut = 0 ) ; <nl> + QString getSaveFileName ( QWidget * parent , const QString & caption , const QString & dir , <nl> + const QString & filter , <nl> + QString * selectedSuffixOut ) ; <nl> <nl> / * * Get open filename , convenience wrapper for QFileDialog : : getOpenFileName . <nl> <nl> mmm a / src / qt / receiverequestdialog . cpp <nl> ppp b / src / qt / receiverequestdialog . cpp <nl> void QRImageWidget : : mousePressEvent ( QMouseEvent * event ) <nl> <nl> void QRImageWidget : : saveImage ( ) <nl> { <nl> - QString fn = GUIUtil : : getSaveFileName ( this , tr ( " Save QR Code " ) , QString ( ) , tr ( " PNG Images ( * . png ) " ) ) ; <nl> + QString fn = GUIUtil : : getSaveFileName ( this , tr ( " Save QR Code " ) , QString ( ) , tr ( " PNG Image ( * . png ) " ) , NULL ) ; <nl> if ( ! fn . isEmpty ( ) ) <nl> { <nl> exportImage ( ) . save ( fn ) ; <nl> mmm a / src / qt / transactionview . cpp <nl> ppp b / src / qt / transactionview . cpp <nl> void TransactionView : : exportClicked ( ) <nl> / / CSV is currently the only supported format <nl> QString filename = GUIUtil : : getSaveFileName ( this , <nl> tr ( " Export Transaction History " ) , QString ( ) , <nl> - tr ( " Comma separated file ( * . csv ) " ) ) ; <nl> + tr ( " Comma separated file ( * . csv ) " ) , NULL ) ; <nl> <nl> if ( filename . isNull ( ) ) <nl> return ; <nl> mmm a / src / qt / walletview . cpp <nl> ppp b / src / qt / walletview . cpp <nl> void WalletView : : backupWallet ( ) <nl> { <nl> QString filename = GUIUtil : : getSaveFileName ( this , <nl> tr ( " Backup Wallet " ) , QString ( ) , <nl> - tr ( " Wallet Data ( * . dat ) " ) ) ; <nl> + tr ( " Wallet Data ( * . dat ) " ) , NULL ) ; <nl> <nl> if ( filename . isEmpty ( ) ) <nl> return ; <nl>
|
Merge pull request from Diapolo / guiutil
|
bitcoin/bitcoin
|
abf34606c0b61d8193288ffefe94acb0c854097e
|
2013-11-12T08:37:27Z
|
mmm a / src / mips / assembler - mips . cc <nl> ppp b / src / mips / assembler - mips . cc <nl> bool CpuFeatures : : initialized_ = false ; <nl> unsigned CpuFeatures : : supported_ = 0 ; <nl> unsigned CpuFeatures : : found_by_runtime_probing_ = 0 ; <nl> <nl> + <nl> + / / Get the CPU features enabled by the build . For cross compilation the <nl> + / / preprocessor symbols CAN_USE_FPU_INSTRUCTIONS <nl> + / / can be defined to enable FPU instructions when building the <nl> + / / snapshot . <nl> + static uint64_t CpuFeaturesImpliedByCompiler ( ) { <nl> + uint64_t answer = 0 ; <nl> + # ifdef CAN_USE_FPU_INSTRUCTIONS <nl> + answer | = 1u < < FPU ; <nl> + # endif / / def CAN_USE_FPU_INSTRUCTIONS <nl> + <nl> + # ifdef __mips__ <nl> + / / If the compiler is allowed to use FPU then we can use FPU too in our code <nl> + / / generation even when generating snapshots . This won ' t work for cross <nl> + / / compilation . <nl> + # if ( defined ( __mips_hard_float ) & & __mips_hard_float ! = 0 ) <nl> + answer | = 1u < < FPU ; <nl> + # endif / / defined ( __mips_hard_float ) & & __mips_hard_float ! = 0 <nl> + # endif / / def __mips__ <nl> + <nl> + return answer ; <nl> + } <nl> + <nl> + <nl> void CpuFeatures : : Probe ( ) { <nl> ASSERT ( ! initialized_ ) ; <nl> # ifdef DEBUG <nl> initialized_ = true ; <nl> # endif <nl> + <nl> + / / Get the features implied by the OS and the compiler settings . This is the <nl> + / / minimal set of features which is also allowed for generated code in the <nl> + / / snapshot . <nl> + supported_ | = OS : : CpuFeaturesImpliedByPlatform ( ) ; <nl> + supported_ | = CpuFeaturesImpliedByCompiler ( ) ; <nl> + <nl> + if ( Serializer : : enabled ( ) ) { <nl> + / / No probing for features if we might serialize ( generate snapshot ) . <nl> + return ; <nl> + } <nl> + <nl> / / If the compiler is allowed to use fpu then we can use fpu too in our <nl> / / code generation . <nl> # if ! defined ( __mips__ ) <nl> void CpuFeatures : : Probe ( ) { <nl> supported_ | = 1u < < FPU ; <nl> } <nl> # else <nl> - if ( Serializer : : enabled ( ) ) { <nl> - supported_ | = OS : : CpuFeaturesImpliedByPlatform ( ) ; <nl> - return ; / / No features if we might serialize . <nl> - } <nl> - <nl> + / / Probe for additional features not already known to be available . <nl> if ( OS : : MipsCpuHasFeature ( FPU ) ) { <nl> / / This implementation also sets the FPU flags if <nl> / / runtime detection of FPU returns true . <nl> mmm a / src / platform - linux . cc <nl> ppp b / src / platform - linux . cc <nl> void OS : : Setup ( ) { <nl> <nl> <nl> uint64_t OS : : CpuFeaturesImpliedByPlatform ( ) { <nl> - # if ( defined ( __mips_hard_float ) & & __mips_hard_float ! = 0 ) <nl> - / / Here gcc is telling us that we are on an MIPS and gcc is assuming that we <nl> - / / have FPU instructions . If gcc can assume it then so can we . <nl> - return 1u < < FPU ; <nl> - # else <nl> return 0 ; / / Linux runs on anything . <nl> - # endif <nl> } <nl> <nl> <nl>
|
MIPS : port ARM : Changed the handling of compiletime CPU feature detection
|
v8/v8
|
c657d440baa2cd9d302ad32062adb9e072c77500
|
2011-08-31T15:34:33Z
|
mmm a / xbmc / cores / VideoRenderers / WinRenderer . cpp <nl> ppp b / xbmc / cores / VideoRenderers / WinRenderer . cpp <nl> void CWinRenderer : : ManageTextures ( ) <nl> <nl> void CWinRenderer : : SelectRenderMethod ( ) <nl> { <nl> + / / Set rendering to dxva before trying it , in order to open the correct processor immediately , when deinterlacing method is auto . <nl> + <nl> / / Force dxva renderer after dxva decoding : PS and SW renderers have performance issues after dxva decode . <nl> if ( g_advancedSettings . m_DXVAForceProcessorRenderer & & CONF_FLAGS_FORMAT_MASK ( m_flags ) = = CONF_FLAGS_FORMAT_DXVA ) <nl> { <nl> CLog : : Log ( LOGNOTICE , " D3D : rendering method forced to DXVA2 processor " ) ; <nl> - if ( m_processor . Open ( m_sourceWidth , m_sourceHeight , m_flags , m_format ) ) <nl> - m_renderMethod = RENDER_DXVA ; <nl> - else <nl> + m_renderMethod = RENDER_DXVA ; <nl> + if ( ! m_processor . Open ( m_sourceWidth , m_sourceHeight , m_flags , m_format ) ) <nl> { <nl> CLog : : Log ( LOGNOTICE , " D3D : unable to open DXVA2 processor " ) ; <nl> m_processor . Close ( ) ; <nl> void CWinRenderer : : SelectRenderMethod ( ) <nl> switch ( m_iRequestedMethod ) <nl> { <nl> case RENDER_METHOD_DXVA : <nl> + m_renderMethod = RENDER_DXVA ; <nl> if ( m_processor . Open ( m_sourceWidth , m_sourceHeight , m_flags , m_format ) ) <nl> - { <nl> - m_renderMethod = RENDER_DXVA ; <nl> break ; <nl> - } <nl> else <nl> { <nl> CLog : : Log ( LOGNOTICE , " D3D : unable to open DXVA2 processor " ) ; <nl> mmm a / xbmc / cores / dvdplayer / DVDCodecs / Video / DXVA . cpp <nl> ppp b / xbmc / cores / dvdplayer / DVDCodecs / Video / DXVA . cpp <nl> static DWORD VP3DeviceID [ ] = { <nl> 0x0000 <nl> } ; <nl> <nl> + typedef struct { <nl> + DWORD VendorID ; <nl> + DWORD DeviceID ; <nl> + } pci_device ; <nl> + <nl> + / / List of devices that drop frames with a deinterlacing processor for progressive material . <nl> + static const pci_device NoDeintProcForProgDevices [ ] = { <nl> + { PCIV_nVidia , 0x0865 } , / / ION <nl> + { PCIV_nVidia , 0x0874 } , / / ION <nl> + { PCIV_nVidia , 0x0876 } , / / ION <nl> + { PCIV_nVidia , 0x087D } , / / ION <nl> + { PCIV_nVidia , 0x087E } , / / ION LE <nl> + { PCIV_nVidia , 0x087F } , / / ION LE <nl> + { 0 , 0x0000 } <nl> + } ; <nl> + <nl> static CStdString GUIDToString ( const GUID & guid ) <nl> { <nl> CStdString buffer ; <nl> bool CProcessor : : Open ( UINT width , UINT height , unsigned int flags , unsigned int <nl> return false ; <nl> } <nl> <nl> + / / frame flags are not available to do the complete calculation of the deinterlacing mode , as done in Render ( ) <nl> + / / It ' s OK , as it doesn ' t make any difference for all hardware except the few GPUs on the quirk list . <nl> + / / And for those GPUs , the correct values will be calculated with the first Render ( ) and the correct processor <nl> + / / will replace the one allocated here , before the user sees anything . <nl> + / / It ' s a bit inefficient , that ' s all . <nl> + m_deinterlace_mode = g_settings . m_currentVideoSettings . m_DeinterlaceMode ; <nl> + m_interlace_method = g_renderManager . AutoInterlaceMethod ( g_settings . m_currentVideoSettings . m_InterlaceMethod ) ; ; <nl> + <nl> + EvaluateQuirkNoDeintProcForProg ( ) ; <nl> + <nl> + if ( g_advancedSettings . m_DXVANoDeintProcForProgressive | | m_quirk_nodeintprocforprog ) <nl> + CLog : : Log ( LOGNOTICE , " DXVA : Auto deinterlacing mode workaround activated . Deinterlacing processor will be used only for interlaced frames . " ) ; <nl> + <nl> if ( ! OpenProcessor ( ) ) <nl> return false ; <nl> <nl> bool CProcessor : : Open ( UINT width , UINT height , unsigned int flags , unsigned int <nl> return true ; <nl> } <nl> <nl> + void CProcessor : : EvaluateQuirkNoDeintProcForProg ( ) <nl> + { <nl> + D3DADAPTER_IDENTIFIER9 AIdentifier = g_Windowing . GetAIdentifier ( ) ; <nl> + <nl> + for ( unsigned idx = 0 ; NoDeintProcForProgDevices [ idx ] . VendorID ! = 0 ; idx + + ) <nl> + { <nl> + if ( NoDeintProcForProgDevices [ idx ] . VendorID = = AIdentifier . VendorId <nl> + & & NoDeintProcForProgDevices [ idx ] . DeviceID = = AIdentifier . DeviceId ) <nl> + { <nl> + m_quirk_nodeintprocforprog = true ; <nl> + return ; <nl> + } <nl> + } <nl> + m_quirk_nodeintprocforprog = false ; <nl> + } <nl> + <nl> bool CProcessor : : SelectProcessor ( ) <nl> { <nl> / / The CProcessor can be run after dxva or software decoding , possibly after software deinterlacing . <nl> bool CProcessor : : Render ( CRect src , CRect dst , IDirect3DSurface9 * target , REFEREN <nl> { <nl> CSingleLock lock ( m_section ) ; <nl> <nl> + / / With auto deinterlacing , the Ion Gen . 1 drops some frames with deinterlacing processor + progressive flags for progressive material . <nl> + / / For that GPU ( or when specified by an advanced setting ) , use the progressive processor . <nl> + / / This is at the expense of the switch speed when video interlacing flags change and a deinterlacing processor is actually required . <nl> + EDEINTERLACEMODE mode = g_settings . m_currentVideoSettings . m_DeinterlaceMode ; <nl> + if ( g_advancedSettings . m_DXVANoDeintProcForProgressive | | m_quirk_nodeintprocforprog ) <nl> + mode = ( flags & RENDER_FLAG_FIELD0 | | flags & RENDER_FLAG_FIELD1 ) ? VS_DEINTERLACEMODE_FORCE : VS_DEINTERLACEMODE_OFF ; <nl> EINTERLACEMETHOD method = g_renderManager . AutoInterlaceMethod ( g_settings . m_currentVideoSettings . m_InterlaceMethod ) ; <nl> if ( m_interlace_method ! = method <nl> - | | m_deinterlace_mode ! = g_settings . m_currentVideoSettings . m_DeinterlaceMode <nl> + | | m_deinterlace_mode ! = mode <nl> | | ! m_process ) <nl> { <nl> - m_deinterlace_mode = g_settings . m_currentVideoSettings . m_DeinterlaceMode ; <nl> + m_deinterlace_mode = mode ; <nl> m_interlace_method = method ; <nl> <nl> if ( ! OpenProcessor ( ) ) <nl> bool CProcessor : : Render ( CRect src , CRect dst , IDirect3DSurface9 * target , REFEREN <nl> / / Override the sample format when the processor doesn ' t need to deinterlace or when deinterlacing is forced and flags are missing . <nl> if ( m_progressive ) <nl> vs . SampleFormat . SampleFormat = DXVA2_SampleProgressiveFrame ; <nl> - else if ( g_settings . m_currentVideoSettings . m_DeinterlaceMode = = VS_DEINTERLACEMODE_FORCE & & vs . SampleFormat . SampleFormat = = DXVA2_SampleProgressiveFrame ) <nl> + else if ( m_deinterlace_mode = = VS_DEINTERLACEMODE_FORCE & & vs . SampleFormat . SampleFormat = = DXVA2_SampleProgressiveFrame ) <nl> vs . SampleFormat . SampleFormat = DXVA2_SampleFieldInterleavedEvenFirst ; <nl> <nl> valid + + ; <nl> mmm a / xbmc / cores / dvdplayer / DVDCodecs / Video / DXVA . h <nl> ppp b / xbmc / cores / dvdplayer / DVDCodecs / Video / DXVA . h <nl> class CProcessor <nl> bool CreateSurfaces ( ) ; <nl> bool OpenProcessor ( ) ; <nl> bool SelectProcessor ( ) ; <nl> + void EvaluateQuirkNoDeintProcForProg ( ) ; <nl> <nl> IDirectXVideoProcessorService * m_service ; <nl> IDirectXVideoProcessor * m_process ; <nl> class CProcessor <nl> <nl> LPDIRECT3DSURFACE9 * m_surfaces ; <nl> CSurfaceContext * m_context ; <nl> + <nl> + bool m_quirk_nodeintprocforprog ; <nl> } ; <nl> <nl> } ; <nl> mmm a / xbmc / settings / AdvancedSettings . cpp <nl> ppp b / xbmc / settings / AdvancedSettings . cpp <nl> void CAdvancedSettings : : Initialize ( ) <nl> m_DXVACheckCompatibility = false ; <nl> m_DXVACheckCompatibilityPresent = false ; <nl> m_DXVAForceProcessorRenderer = true ; <nl> + m_DXVANoDeintProcForProgressive = false ; <nl> m_videoFpsDetect = 1 ; <nl> m_videoDefaultLatency = 0 . 0 ; <nl> <nl> void CAdvancedSettings : : ParseSettingsFile ( const CStdString & file ) <nl> m_DXVACheckCompatibilityPresent = XMLUtils : : GetBoolean ( pElement , " checkdxvacompatibility " , m_DXVACheckCompatibility ) ; <nl> <nl> XMLUtils : : GetBoolean ( pElement , " forcedxvarenderer " , m_DXVAForceProcessorRenderer ) ; <nl> + XMLUtils : : GetBoolean ( pElement , " dxvanodeintforprogressive " , m_DXVANoDeintProcForProgressive ) ; <nl> / / 0 = disable fps detect , 1 = only detect on timestamps with uniform spacing , 2 detect on all timestamps <nl> XMLUtils : : GetInt ( pElement , " fpsdetect " , m_videoFpsDetect , 0 , 2 ) ; <nl> <nl> mmm a / xbmc / settings / AdvancedSettings . h <nl> ppp b / xbmc / settings / AdvancedSettings . h <nl> class CAdvancedSettings <nl> bool m_DXVACheckCompatibility ; <nl> bool m_DXVACheckCompatibilityPresent ; <nl> bool m_DXVAForceProcessorRenderer ; <nl> + bool m_DXVANoDeintProcForProgressive ; <nl> int m_videoFpsDetect ; <nl> <nl> CStdString m_videoDefaultPlayer ; <nl>
|
Merge pull request from CrystalP / fix - dxvaproc
|
xbmc/xbmc
|
48c0556c926361edf0e89dbba075ca2512f8cc48
|
2012-03-20T02:52:54Z
|
mmm a / include / c11log / details / blocking_queue . h <nl> ppp b / include / c11log / details / blocking_queue . h <nl> class blocking_queue { <nl> } <nl> <nl> / / Push copy of item into the back of the queue . <nl> - / / If queue is full , block the calling thread util there is room or timeout have passed . <nl> + / / If the queue is full , block the calling thread util there is room or timeout have passed . <nl> / / Return : false on timeout , true on successful push . <nl> template < class Duration_Rep , class Duration_Period > <nl> bool push ( const T & item , const std : : chrono : : duration < Duration_Rep , Duration_Period > & timeout ) <nl> class blocking_queue { <nl> return false ; <nl> } <nl> _q . push ( item ) ; <nl> - if ( _q . size ( ) = = 1 ) <nl> + if ( _q . size ( ) < = 1 ) <nl> { <nl> - ul . unlock ( ) ; <nl> + ul . unlock ( ) ; / / So the notified thread will have better chance to accuire the lock immediatly . . <nl> _item_pushed_cond . notify_one ( ) ; <nl> } <nl> return true ; <nl> } <nl> <nl> / / Push copy of item into the back of the queue . <nl> - / / If queue is full , block the calling thread until there is room <nl> + / / If the queue is full , block the calling thread until there is room . <nl> void push ( const T & item ) <nl> { <nl> while ( ! push ( item , std : : chrono : : hours : : max ( ) ) ) ; <nl> } <nl> <nl> - / / Pop a copy of the front item in the queue into the given item ref <nl> - / / If queue is empty , block the calling thread util there is item to pop or timeout have passed . <nl> - / / Return : false on timeout , true on successful pop <nl> + / / Pop a copy of the front item in the queue into the given item ref . <nl> + / / If the queue is empty , block the calling thread util there is item to pop or timeout have passed . <nl> + / / Return : false on timeout , true on successful pop / <nl> template < class Duration_Rep , class Duration_Period > <nl> bool pop ( T & item , const std : : chrono : : duration < Duration_Rep , Duration_Period > & timeout ) <nl> { <nl> class blocking_queue { <nl> _q . pop ( ) ; <nl> if ( _q . size ( ) > = _max_size - 1 ) <nl> { <nl> - ul . unlock ( ) ; <nl> + ul . unlock ( ) ; / / So the notified thread will have better chance to accuire the lock immediatly . . <nl> _item_popped_cond . notify_one ( ) ; <nl> } <nl> return true ; <nl> } <nl> <nl> - / / Pop a copy of the front item in the queue into the given item ref <nl> - / / If queue is empty , block the calling thread util there is item to pop . <nl> + / / Pop a copy of the front item in the queue into the given item ref . <nl> + / / If the queue is empty , block the calling thread util there is item to pop . <nl> void pop ( T & item ) <nl> { <nl> while ( ! pop ( item , std : : chrono : : hours : : max ( ) ) ) ; <nl>
|
Minor comments
|
gabime/spdlog
|
3e88d785c02954220d8481c540a5702c03e663f2
|
2014-01-25T10:59:43Z
|
mmm a / aten / src / TH / generic / THTensorRandom . h <nl> ppp b / aten / src / TH / generic / THTensorRandom . h <nl> TH_API void THTensor_ ( clampedRandom ) ( THTensor * self , int64_t min , int64_t max , a <nl> TH_API void THTensor_ ( cappedRandom ) ( THTensor * self , int64_t max , at : : Generator * _generator ) ; <nl> <nl> # if defined ( TH_REAL_IS_FLOAT ) | | defined ( TH_REAL_IS_DOUBLE ) <nl> - TH_API void THTensor_ ( bernoulli_Tensor ) ( THTensor * self , at : : Generator * _generator , THTensor * p ) ; <nl> TH_API void THTensor_ ( uniform ) ( THTensor * self , double a , double b , at : : Generator * _generator ) ; <nl> TH_API void THTensor_ ( normal ) ( THTensor * self , double mean , double stdv , at : : Generator * _generator ) ; <nl> TH_API void THTensor_ ( normal_means ) ( THTensor * self , THTensor * means , double stddev , at : : Generator * gen ) ; <nl>
|
Delete unused bernoulli_Tensor from THTensorRandom . h
|
pytorch/pytorch
|
773292450152b4e91db6bf13edd8d822ec4179f9
|
2020-01-17T19:09:19Z
|
mmm a / 3rdparty / openvx / include / openvx_hal . hpp <nl> ppp b / 3rdparty / openvx / include / openvx_hal . hpp <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> <nl> vxContext * ctx = vxContext : : getContext ( ) ; <nl> <nl> + vx_size maxKernelDim ; <nl> + vxErr : : check ( vxQueryContext ( ctx - > ctx , VX_CONTEXT_NONLINEAR_MAX_DIMENSION , & maxKernelDim , sizeof ( maxKernelDim ) ) ) ; <nl> + if ( kernel_width > maxKernelDim | | kernel_height > maxKernelDim ) <nl> + return CV_HAL_ERROR_NOT_IMPLEMENTED ; <nl> + <nl> std : : vector < uchar > kernel_mat ; <nl> - kernel_mat . resize ( kernel_width * kernel_height ) ; <nl> + kernel_mat . reserve ( kernel_width * kernel_height ) ; <nl> switch ( CV_MAT_DEPTH ( kernel_type ) ) <nl> { <nl> case CV_8U : <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> for ( int j = 0 ; j < kernel_height ; + + j ) <nl> { <nl> uchar * kernel_row = kernel_data + j * kernel_step ; <nl> - for ( int i = 0 ; i < kernel_height ; + + i ) <nl> + for ( int i = 0 ; i < kernel_width ; + + i ) <nl> kernel_mat . push_back ( kernel_row [ i ] ? 255 : 0 ) ; <nl> } <nl> break ; <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> for ( int j = 0 ; j < kernel_height ; + + j ) <nl> { <nl> short * kernel_row = ( short * ) ( kernel_data + j * kernel_step ) ; <nl> - for ( int i = 0 ; i < kernel_height ; + + i ) <nl> + for ( int i = 0 ; i < kernel_width ; + + i ) <nl> kernel_mat . push_back ( kernel_row [ i ] ? 255 : 0 ) ; <nl> } <nl> break ; <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> for ( int j = 0 ; j < kernel_height ; + + j ) <nl> { <nl> int * kernel_row = ( int * ) ( kernel_data + j * kernel_step ) ; <nl> - for ( int i = 0 ; i < kernel_height ; + + i ) <nl> + for ( int i = 0 ; i < kernel_width ; + + i ) <nl> kernel_mat . push_back ( kernel_row [ i ] ? 255 : 0 ) ; <nl> } <nl> break ; <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> for ( int j = 0 ; j < kernel_height ; + + j ) <nl> { <nl> float * kernel_row = ( float * ) ( kernel_data + j * kernel_step ) ; <nl> - for ( int i = 0 ; i < kernel_height ; + + i ) <nl> + for ( int i = 0 ; i < kernel_width ; + + i ) <nl> kernel_mat . push_back ( kernel_row [ i ] ? 255 : 0 ) ; <nl> } <nl> break ; <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> for ( int j = 0 ; j < kernel_height ; + + j ) <nl> { <nl> double * kernel_row = ( double * ) ( kernel_data + j * kernel_step ) ; <nl> - for ( int i = 0 ; i < kernel_height ; + + i ) <nl> + for ( int i = 0 ; i < kernel_width ; + + i ) <nl> kernel_mat . push_back ( kernel_row [ i ] ? 255 : 0 ) ; <nl> } <nl> break ; <nl> inline int ovx_hal_morphInit ( cvhalFilter2D * * filter_context , int operation , int <nl> { <nl> case MORPH_ERODE : <nl> mat = new MorphCtx ( * ctx , kernel_mat . data ( ) , kernel_width , kernel_height , VX_NONLINEAR_FILTER_MIN , border ) ; <nl> + break ; <nl> case MORPH_DILATE : <nl> mat = new MorphCtx ( * ctx , kernel_mat . data ( ) , kernel_width , kernel_height , VX_NONLINEAR_FILTER_MAX , border ) ; <nl> break ; <nl>
|
Fix for OpenVX implementation of morphology HAL API
|
opencv/opencv
|
25b014691f9f5f9acf9344a3c324f60ea71a2034
|
2016-09-27T16:05:35Z
|
mmm a / lib / AST / Verifier . cpp <nl> ppp b / lib / AST / Verifier . cpp <nl> struct ASTNodeBase { } ; <nl> var - > getType ( ) . print ( Out ) ; <nl> abort ( ) ; <nl> } <nl> - verifyParsedBase ( var ) ; <nl> + verifyCheckedBase ( var ) ; <nl> } <nl> <nl> void verifyParsed ( EnumElementDecl * UED ) { <nl>
|
s / verifyParsedBase / verifyCheckedBase
|
apple/swift
|
0a85353191f6826423befc377e0d77716b26c764
|
2013-12-05T18:58:09Z
|
mmm a / docs - translations / ko - KR / api / menu . md <nl> ppp b / docs - translations / ko - KR / api / menu . md <nl> OS X에선 지정한 어플리케이션 메뉴에 상관없이 메뉴의 첫번 <nl> ` ` ` <nl> <nl> [ AboutInformationPropertyListFiles ] : https : / / developer . apple . com / library / ios / documentation / general / Reference / InfoPlistKeyReference / Articles / AboutInformationPropertyListFiles . html <nl> - [ setMenu ] : https : / / github . com / electron / electron / blob / master / docs - translations / ko - KR / api / browser - window . md # winsetmenumenu - linux - windows <nl> + [ setMenu ] : . / browser - window . md # winsetmenumenu - linux - windows <nl> mmm a / docs - translations / ko - KR / tutorial / using - native - node - modules . md <nl> ppp b / docs - translations / ko - KR / tutorial / using - native - node - modules . md <nl> Electron의 V8 버전에 맞춰 네이티브 모듈을 다시 빌드하고 헤 <nl> node . js의 버전을 확인할 필요가 있습니다 . Electron에서 사용하는 node 버전은 <nl> [ releases ] ( https : / / github . com / electron / electron / releases ) 에서 확인할 수 있으며 <nl> ` process . version ` 을 출력하여 버전을 확인할 수도 있습니다 . <nl> - ( [ 시작하기 ] ( https : / / github . com / electron / electron / blob / master / docs - translations / ko - KR / tutorial / quick - start . md ) 의 <nl> + ( [ 시작하기 ] ( . / quick - start . md ) 의 <nl> 예제를 참고하세요 ) <nl> <nl> 혹시 직접 만든 네이티브 모듈이 있다면 [ NAN ] ( https : / / github . com / nodejs / nan / ) 모듈을 <nl>
|
: memo : Fix url to relative
|
electron/electron
|
a048bddaa55bb055558676801bf56c456512c3a3
|
2016-04-11T01:51:31Z
|
mmm a / editor / plugins / tile_map_editor_plugin . cpp <nl> ppp b / editor / plugins / tile_map_editor_plugin . cpp <nl> void TileMapEditor : : _sbox_input ( const InputEvent & p_ie ) { <nl> } <nl> } <nl> <nl> + / / Implementation detail of TileMapEditor : : _update_palette ( ) ; <nl> + / / in modern C + + this could have been inside its body <nl> + namespace { <nl> + struct _PaletteEntry { <nl> + int id ; <nl> + String name ; <nl> + <nl> + bool operator < ( const _PaletteEntry & p_rhs ) const { <nl> + return name < p_rhs . name ; <nl> + } <nl> + } ; <nl> + } <nl> + <nl> void TileMapEditor : : _update_palette ( ) { <nl> <nl> if ( ! node ) <nl> void TileMapEditor : : _update_palette ( ) { <nl> min_size * = EDSCALE ; <nl> int hseparation = EDITOR_DEF ( " editors / tile_map / palette_item_hseparation " , 8 ) ; <nl> bool show_tile_names = bool ( EDITOR_DEF ( " editors / tile_map / show_tile_names " , true ) ) ; <nl> + bool show_tile_ids = bool ( EDITOR_DEF ( " editors / tile_map / show_tile_ids " , false ) ) ; <nl> + bool sort_by_name = bool ( EDITOR_DEF ( " editors / tile_map / sort_tiles_by_name " , true ) ) ; <nl> <nl> palette - > add_constant_override ( " hseparation " , hseparation * EDSCALE ) ; <nl> palette - > add_constant_override ( " vseparation " , 8 * EDSCALE ) ; <nl> void TileMapEditor : : _update_palette ( ) { <nl> <nl> String filter = search_box - > get_text ( ) . strip_edges ( ) ; <nl> <nl> + Vector < _PaletteEntry > entries ; <nl> + <nl> for ( List < int > : : Element * E = tiles . front ( ) ; E ; E = E - > next ( ) ) { <nl> <nl> - String name ; <nl> + String name = tileset - > tile_get_name ( E - > get ( ) ) ; <nl> <nl> - if ( tileset - > tile_get_name ( E - > get ( ) ) ! = " " ) { <nl> - name = itos ( E - > get ( ) ) + " - " + tileset - > tile_get_name ( E - > get ( ) ) ; <nl> + if ( name ! = " " ) { <nl> + if ( show_tile_ids ) { <nl> + if ( sort_by_name ) { <nl> + name = name + " - " + itos ( E - > get ( ) ) ; <nl> + } else { <nl> + name = itos ( E - > get ( ) ) + " - " + name ; <nl> + } <nl> + } <nl> } else { <nl> name = " # " + itos ( E - > get ( ) ) ; <nl> } <nl> void TileMapEditor : : _update_palette ( ) { <nl> if ( filter ! = " " & & ! filter . is_subsequence_ofi ( name ) ) <nl> continue ; <nl> <nl> + const _PaletteEntry entry = { E - > get ( ) , name } ; <nl> + entries . push_back ( entry ) ; <nl> + } <nl> + <nl> + if ( sort_by_name ) { <nl> + entries . sort ( ) ; <nl> + } <nl> + <nl> + for ( int i = 0 ; i < entries . size ( ) ; i + + ) { <nl> + <nl> if ( show_tile_names ) { <nl> - palette - > add_item ( name ) ; <nl> + palette - > add_item ( entries [ i ] . name ) ; <nl> } else { <nl> palette - > add_item ( String ( ) ) ; <nl> } <nl> <nl> - Ref < Texture > tex = tileset - > tile_get_texture ( E - > get ( ) ) ; <nl> + Ref < Texture > tex = tileset - > tile_get_texture ( entries [ i ] . id ) ; <nl> <nl> if ( tex . is_valid ( ) ) { <nl> - Rect2 region = tileset - > tile_get_region ( E - > get ( ) ) ; <nl> + Rect2 region = tileset - > tile_get_region ( entries [ i ] . id ) ; <nl> <nl> if ( ! region . has_no_area ( ) ) <nl> palette - > set_item_icon_region ( palette - > get_item_count ( ) - 1 , region ) ; <nl> void TileMapEditor : : _update_palette ( ) { <nl> palette - > set_item_icon ( palette - > get_item_count ( ) - 1 , tex ) ; <nl> } <nl> <nl> - palette - > set_item_metadata ( palette - > get_item_count ( ) - 1 , E - > get ( ) ) ; <nl> + palette - > set_item_metadata ( palette - > get_item_count ( ) - 1 , entries [ i ] . id ) ; <nl> } <nl> <nl> palette - > set_same_column_width ( true ) ; <nl> TileMapEditorPlugin : : TileMapEditorPlugin ( EditorNode * p_node ) { <nl> EDITOR_DEF ( " editors / tile_map / preview_size " , 64 ) ; <nl> EDITOR_DEF ( " editors / tile_map / palette_item_hseparation " , 8 ) ; <nl> EDITOR_DEF ( " editors / tile_map / show_tile_names " , true ) ; <nl> + EDITOR_DEF ( " editors / tile_map / show_tile_ids " , false ) ; <nl> + EDITOR_DEF ( " editors / tile_map / sort_tiles_by_name " , true ) ; <nl> EDITOR_DEF ( " editors / tile_map / bucket_fill_preview " , true ) ; <nl> <nl> tile_map_editor = memnew ( TileMapEditor ( p_node ) ) ; <nl>
|
Merge pull request from RandomShaper / improve - tile - palette
|
godotengine/godot
|
84bd039851e2b9466599057284cbac40eab430b5
|
2017-03-30T08:29:46Z
|
mmm a / js / client / modules / @ arangodb / arango - collection . js <nl> ppp b / js / client / modules / @ arangodb / arango - collection . js <nl> ArangoCollection . prototype . properties = function ( properties ) { <nl> ' keyOptions ' : false , <nl> ' indexBuckets ' : true , <nl> ' replicationFactor ' : false , <nl> + ' distributeShardsLike ' : false , <nl> } ; <nl> var a ; <nl> <nl>
|
Hand out distributeShardsLike in properties in arangosh .
|
arangodb/arangodb
|
ab56530f764274680ba17b7912a0d066bd8b48c6
|
2017-04-25T12:49:19Z
|
mmm a / cores / esp8266 / WString . cpp <nl> ppp b / cores / esp8266 / WString . cpp <nl> void String : : move ( String & rhs ) { <nl> } <nl> if ( rhs . sso ( ) ) { <nl> setSSO ( true ) ; <nl> - memcpy ( sso_buf , rhs . sso_buf , sizeof ( sso_buf ) ) ; <nl> + memmove ( sso_buf , rhs . sso_buf , sizeof ( sso_buf ) ) ; <nl> } else { <nl> setSSO ( false ) ; <nl> setBuffer ( rhs . wbuffer ( ) ) ; <nl> void String : : replace ( const String & find , const String & replace ) { <nl> char * foundAt ; <nl> if ( diff = = 0 ) { <nl> while ( ( foundAt = strstr ( readFrom , find . buffer ( ) ) ) ! = NULL ) { <nl> - memcpy ( foundAt , replace . buffer ( ) , replace . len ( ) ) ; <nl> + memmove ( foundAt , replace . buffer ( ) , replace . len ( ) ) ; <nl> readFrom = foundAt + replace . len ( ) ; <nl> } <nl> } else if ( diff < 0 ) { <nl> char * writeTo = wbuffer ( ) ; <nl> while ( ( foundAt = strstr ( readFrom , find . buffer ( ) ) ) ! = NULL ) { <nl> unsigned int n = foundAt - readFrom ; <nl> - memcpy ( writeTo , readFrom , n ) ; <nl> + memmove ( writeTo , readFrom , n ) ; <nl> writeTo + = n ; <nl> - memcpy ( writeTo , replace . buffer ( ) , replace . len ( ) ) ; <nl> + memmove ( writeTo , replace . buffer ( ) , replace . len ( ) ) ; <nl> writeTo + = replace . len ( ) ; <nl> readFrom = foundAt + find . len ( ) ; <nl> setLen ( len ( ) + diff ) ; <nl> } <nl> - strcpy ( writeTo , readFrom ) ; <nl> + memmove ( writeTo , readFrom , strlen ( readFrom ) + 1 ) ; <nl> } else { <nl> unsigned int size = len ( ) ; / / compute size needed for result <nl> while ( ( foundAt = strstr ( readFrom , find . buffer ( ) ) ) ! = NULL ) { <nl> void String : : replace ( const String & find , const String & replace ) { <nl> readFrom = wbuffer ( ) + index + find . len ( ) ; <nl> memmove ( readFrom + diff , readFrom , len ( ) - ( readFrom - buffer ( ) ) ) ; <nl> int newLen = len ( ) + diff ; <nl> - memcpy ( wbuffer ( ) + index , replace . buffer ( ) , replace . len ( ) ) ; <nl> + memmove ( wbuffer ( ) + index , replace . buffer ( ) , replace . len ( ) ) ; <nl> setLen ( newLen ) ; <nl> wbuffer ( ) [ newLen ] = 0 ; <nl> index - - ; <nl> mmm a / tests / host / core / test_string . cpp <nl> ppp b / tests / host / core / test_string . cpp <nl> TEST_CASE ( " String SSO handles junk in memory " , " [ core ] [ String ] " ) <nl> REQUIRE ( * s = = " CO2_defect " ) ; <nl> s - > ~ String ( ) ; <nl> } <nl> + <nl> + <nl> + TEST_CASE ( " Issue # 5949 - Overlapping src / dest in replace " , " [ core ] [ String ] " ) <nl> + { <nl> + String blah = " blah " ; <nl> + blah . replace ( " xx " , " y " ) ; <nl> + REQUIRE ( blah = = " blah " ) ; <nl> + blah . replace ( " x " , " yy " ) ; <nl> + REQUIRE ( blah = = " blah " ) ; <nl> + blah . replace ( blah , blah ) ; <nl> + REQUIRE ( blah = = " blah " ) ; <nl> + } <nl>
|
Fix String . replace overlapping strcpy ( )
|
esp8266/Arduino
|
971217027637739c4f0555400bce36dfe44bfdbe
|
2019-04-10T14:21:15Z
|
mmm a / src / compiler / ppc / code - generator - ppc . cc <nl> ppp b / src / compiler / ppc / code - generator - ppc . cc <nl> void CodeGenerator : : AssembleArchTableSwitch ( Instruction * instr ) { <nl> __ Jump ( kScratchReg ) ; <nl> } <nl> <nl> - CodeGenerator : : CodeGenResult CodeGenerator : : AssembleDeoptimizerCall ( <nl> - int deoptimization_id , SourcePosition pos ) { <nl> - DeoptimizeReason deoptimization_reason = <nl> - GetDeoptimizationReason ( deoptimization_id ) ; <nl> - Deoptimizer : : BailoutType bailout_type = <nl> - DeoptimizerCallBailout ( deoptimization_id , pos ) ; <nl> - Address deopt_entry = Deoptimizer : : GetDeoptimizationEntry ( <nl> - __ isolate ( ) , deoptimization_id , bailout_type ) ; <nl> - / / TODO ( turbofan ) : We should be able to generate better code by sharing the <nl> - / / actual final call site and just bl ' ing to it here , similar to what we do <nl> - / / in the lithium backend . <nl> - if ( deopt_entry = = nullptr ) return kTooManyDeoptimizationBailouts ; <nl> - if ( info ( ) - > is_source_positions_enabled ( ) ) { <nl> - __ RecordDeoptReason ( deoptimization_reason , pos , deoptimization_id ) ; <nl> - } <nl> - __ Call ( deopt_entry , RelocInfo : : RUNTIME_ENTRY ) ; <nl> - return kSuccess ; <nl> - } <nl> - <nl> void CodeGenerator : : FinishFrame ( Frame * frame ) { <nl> CallDescriptor * descriptor = linkage ( ) - > GetIncomingDescriptor ( ) ; <nl> const RegList double_saves = descriptor - > CalleeSavedFPRegisters ( ) ; <nl> mmm a / src / compiler / s390 / code - generator - s390 . cc <nl> ppp b / src / compiler / s390 / code - generator - s390 . cc <nl> void CodeGenerator : : AssembleArchTableSwitch ( Instruction * instr ) { <nl> __ Jump ( kScratchReg ) ; <nl> } <nl> <nl> - CodeGenerator : : CodeGenResult CodeGenerator : : AssembleDeoptimizerCall ( <nl> - int deoptimization_id , SourcePosition pos ) { <nl> - DeoptimizeReason deoptimization_reason = <nl> - GetDeoptimizationReason ( deoptimization_id ) ; <nl> - Deoptimizer : : BailoutType bailout_type = <nl> - DeoptimizerCallBailout ( deoptimization_id , pos ) ; <nl> - Address deopt_entry = Deoptimizer : : GetDeoptimizationEntry ( <nl> - __ isolate ( ) , deoptimization_id , bailout_type ) ; <nl> - / / TODO ( turbofan ) : We should be able to generate better code by sharing the <nl> - / / actual final call site and just bl ' ing to it here , similar to what we do <nl> - / / in the lithium backend . <nl> - if ( deopt_entry = = nullptr ) return kTooManyDeoptimizationBailouts ; <nl> - if ( info ( ) - > is_source_positions_enabled ( ) ) { <nl> - __ RecordDeoptReason ( deoptimization_reason , pos , deoptimization_id ) ; <nl> - } <nl> - __ Call ( deopt_entry , RelocInfo : : RUNTIME_ENTRY ) ; <nl> - return kSuccess ; <nl> - } <nl> - <nl> void CodeGenerator : : FinishFrame ( Frame * frame ) { <nl> CallDescriptor * descriptor = linkage ( ) - > GetIncomingDescriptor ( ) ; <nl> const RegList double_saves = descriptor - > CalleeSavedFPRegisters ( ) ; <nl> mmm a / src / ppc / macro - assembler - ppc . h <nl> ppp b / src / ppc / macro - assembler - ppc . h <nl> class TurboAssembler : public Assembler { <nl> Condition cond = al ) ; <nl> void Call ( Label * target ) ; <nl> <nl> + void CallForDeoptimization ( Address target , RelocInfo : : Mode rmode ) { <nl> + Call ( target , rmode ) ; <nl> + } <nl> + <nl> / / Emit code to discard a non - negative number of pointer - sized elements <nl> / / from the stack , clobbering only the sp register . <nl> void Drop ( int count ) ; <nl> mmm a / src / s390 / macro - assembler - s390 . h <nl> ppp b / src / s390 / macro - assembler - s390 . h <nl> class TurboAssembler : public Assembler { <nl> void Ret ( ) { b ( r14 ) ; } <nl> void Ret ( Condition cond ) { b ( cond , r14 ) ; } <nl> <nl> + void CallForDeoptimization ( Address target , RelocInfo : : Mode rmode ) { <nl> + Call ( target , rmode ) ; <nl> + } <nl> <nl> / / Emit code to discard a non - negative number of pointer - sized elements <nl> / / from the stack , clobbering only the sp register . <nl>
|
PPC / s390 : Refactor of AssembleDeoptimizerCall .
|
v8/v8
|
43c60aeb0624e315c677f4035d9b88769b95149f
|
2017-08-22T16:42:40Z
|
mmm a / src / openalpr / support / filesystem . h <nl> ppp b / src / openalpr / support / filesystem . h <nl> bool startsWith ( std : : string const & fullString , std : : string const & prefix ) ; <nl> bool hasEnding ( std : : string const & fullString , std : : string const & ending ) ; <nl> bool hasEndingInsensitive ( const std : : string & fullString , const std : : string & ending ) ; <nl> <nl> + std : : string filenameWithoutExtension ( std : : string filename ) ; <nl> + <nl> bool DirectoryExists ( const char * pzPath ) ; <nl> bool fileExists ( const char * pzPath ) ; <nl> std : : vector < std : : string > getFilesInDir ( const char * dirPath ) ; <nl>
|
Added function to support
|
openalpr/openalpr
|
7eb325e5282200e3a6151cc78655c12364fb2586
|
2014-06-21T02:31:56Z
|
mmm a / src / flags / flag - definitions . h <nl> ppp b / src / flags / flag - definitions . h <nl> DEFINE_BOOL ( es_staging , false , <nl> DEFINE_BOOL ( harmony , false , " enable all completed harmony features " ) <nl> DEFINE_BOOL ( harmony_shipping , true , " enable all shipped harmony features " ) <nl> DEFINE_IMPLICATION ( es_staging , harmony ) <nl> - / / Enabling import . meta requires to also enable import ( ) <nl> - DEFINE_IMPLICATION ( harmony_import_meta , harmony_dynamic_import ) <nl> / / Enabling FinalizationRegistry # cleanupSome also enables weak refs <nl> DEFINE_IMPLICATION ( harmony_weak_refs_with_cleanup_some , harmony_weak_refs ) <nl> <nl> DEFINE_IMPLICATION ( harmony_weak_refs_with_cleanup_some , harmony_weak_refs ) <nl> V ( harmony_sharedarraybuffer , " harmony sharedarraybuffer " ) \ <nl> V ( harmony_atomics , " harmony atomics " ) \ <nl> V ( harmony_import_meta , " harmony import . meta property " ) \ <nl> - V ( harmony_dynamic_import , " harmony dynamic import " ) \ <nl> V ( harmony_promise_all_settled , " harmony Promise . allSettled " ) \ <nl> V ( harmony_promise_any , " harmony Promise . any " ) \ <nl> V ( harmony_private_methods , " harmony private methods in class literals " ) \ <nl> mmm a / src / init / bootstrapper . cc <nl> ppp b / src / init / bootstrapper . cc <nl> void Genesis : : InitializeCallSiteBuiltins ( ) { <nl> <nl> EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE ( harmony_namespace_exports ) <nl> EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE ( harmony_private_methods ) <nl> - EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE ( harmony_dynamic_import ) <nl> EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE ( harmony_import_meta ) <nl> EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE ( harmony_regexp_sequence ) <nl> EMPTY_INITIALIZE_GLOBAL_FOR_FEATURE ( harmony_top_level_await ) <nl> mmm a / src / parsing / parse - info . cc <nl> ppp b / src / parsing / parse - info . cc <nl> UnoptimizedCompileFlags : : UnoptimizedCompileFlags ( Isolate * isolate , <nl> set_might_always_opt ( FLAG_always_opt | | FLAG_prepare_always_opt ) ; <nl> set_allow_natives_syntax ( FLAG_allow_natives_syntax ) ; <nl> set_allow_lazy_compile ( FLAG_lazy ) ; <nl> - set_allow_harmony_dynamic_import ( FLAG_harmony_dynamic_import ) ; <nl> set_allow_harmony_import_meta ( FLAG_harmony_import_meta ) ; <nl> set_allow_harmony_private_methods ( FLAG_harmony_private_methods ) ; <nl> set_collect_source_positions ( ! FLAG_enable_lazy_source_positions | | <nl> mmm a / src / parsing / parse - info . h <nl> ppp b / src / parsing / parse - info . h <nl> class Zone ; <nl> V ( might_always_opt , bool , 1 , _ ) \ <nl> V ( allow_natives_syntax , bool , 1 , _ ) \ <nl> V ( allow_lazy_compile , bool , 1 , _ ) \ <nl> - V ( allow_harmony_dynamic_import , bool , 1 , _ ) \ <nl> V ( allow_harmony_import_meta , bool , 1 , _ ) \ <nl> V ( allow_harmony_private_methods , bool , 1 , _ ) \ <nl> V ( is_oneshot_iife , bool , 1 , _ ) \ <nl> mmm a / src / parsing / parser - base . h <nl> ppp b / src / parsing / parser - base . h <nl> ParserBase < Impl > : : ParsePrimaryExpression ( ) { <nl> return ParseSuperExpression ( is_new ) ; <nl> } <nl> case Token : : IMPORT : <nl> - if ( ! flags ( ) . allow_harmony_dynamic_import ( ) ) break ; <nl> return ParseImportExpressions ( ) ; <nl> <nl> case Token : : LBRACK : <nl> ParserBase < Impl > : : ParseMemberWithPresentNewPrefixesExpression ( ) { <nl> if ( peek ( ) = = Token : : SUPER ) { <nl> const bool is_new = true ; <nl> result = ParseSuperExpression ( is_new ) ; <nl> - } else if ( flags ( ) . allow_harmony_dynamic_import ( ) & & <nl> - peek ( ) = = Token : : IMPORT & & <nl> - ( ! flags ( ) . allow_harmony_import_meta ( ) | | <nl> - PeekAhead ( ) = = Token : : LPAREN ) ) { <nl> + } else if ( peek ( ) = = Token : : IMPORT & & ( ! flags ( ) . allow_harmony_import_meta ( ) | | <nl> + PeekAhead ( ) = = Token : : LPAREN ) ) { <nl> impl ( ) - > ReportMessageAt ( scanner ( ) - > peek_location ( ) , <nl> MessageTemplate : : kImportCallNotNewExpression ) ; <nl> return impl ( ) - > FailureExpression ( ) ; <nl> ParserBase < Impl > : : ParseMemberExpression ( ) { <nl> template < typename Impl > <nl> typename ParserBase < Impl > : : ExpressionT <nl> ParserBase < Impl > : : ParseImportExpressions ( ) { <nl> - DCHECK ( flags ( ) . allow_harmony_dynamic_import ( ) ) ; <nl> - <nl> Consume ( Token : : IMPORT ) ; <nl> int pos = position ( ) ; <nl> if ( flags ( ) . allow_harmony_import_meta ( ) & & Check ( Token : : PERIOD ) ) { <nl> mmm a / src / parsing / parser . cc <nl> ppp b / src / parsing / parser . cc <nl> Statement * Parser : : ParseModuleItem ( ) { <nl> / / We must be careful not to parse a dynamic import expression as an import <nl> / / declaration . Same for import . meta expressions . <nl> Token : : Value peek_ahead = PeekAhead ( ) ; <nl> - if ( ( ! flags ( ) . allow_harmony_dynamic_import ( ) | | <nl> - peek_ahead ! = Token : : LPAREN ) & & <nl> + if ( peek_ahead ! = Token : : LPAREN & & <nl> ( ! flags ( ) . allow_harmony_import_meta ( ) | | peek_ahead ! = Token : : PERIOD ) ) { <nl> ParseImportDeclaration ( ) ; <nl> return factory ( ) - > EmptyStatement ( ) ; <nl> mmm a / test / cctest / test - api . cc <nl> ppp b / test / cctest / test - api . cc <nl> v8 : : MaybeLocal < v8 : : Promise > HostImportModuleDynamicallyCallbackResolve ( <nl> } <nl> <nl> TEST ( DynamicImport ) { <nl> - i : : FLAG_harmony_dynamic_import = true ; <nl> LocalContext context ; <nl> v8 : : Isolate * isolate = context - > GetIsolate ( ) ; <nl> v8 : : HandleScope scope ( isolate ) ; <nl> void HostInitializeImportMetaObjectCallbackStatic ( Local < Context > context , <nl> } <nl> <nl> TEST ( ImportMeta ) { <nl> - i : : FLAG_harmony_dynamic_import = true ; <nl> i : : FLAG_harmony_import_meta = true ; <nl> LocalContext context ; <nl> v8 : : Isolate * isolate = context - > GetIsolate ( ) ; <nl> void HostInitializeImportMetaObjectCallbackThrow ( Local < Context > context , <nl> } <nl> <nl> TEST ( ImportMetaThrowUnhandled ) { <nl> - i : : FLAG_harmony_dynamic_import = true ; <nl> i : : FLAG_harmony_import_meta = true ; <nl> LocalContext context ; <nl> v8 : : Isolate * isolate = context - > GetIsolate ( ) ; <nl> TEST ( ImportMetaThrowUnhandled ) { <nl> } <nl> <nl> TEST ( ImportMetaThrowHandled ) { <nl> - i : : FLAG_harmony_dynamic_import = true ; <nl> i : : FLAG_harmony_import_meta = true ; <nl> LocalContext context ; <nl> v8 : : Isolate * isolate = context - > GetIsolate ( ) ; <nl> mmm a / test / cctest / test - modules . cc <nl> ppp b / test / cctest / test - modules . cc <nl> v8 : : MaybeLocal < v8 : : Promise > HostImportModuleDynamicallyCallbackReject ( <nl> <nl> TEST ( ModuleEvaluationTopLevelAwaitDynamicImport ) { <nl> bool previous_top_level_await_flag_value = i : : FLAG_harmony_top_level_await ; <nl> - bool previous_dynamic_import_flag_value = i : : FLAG_harmony_dynamic_import ; <nl> i : : FLAG_harmony_top_level_await = true ; <nl> - i : : FLAG_harmony_dynamic_import = true ; <nl> Isolate * isolate = CcTest : : isolate ( ) ; <nl> HandleScope scope ( isolate ) ; <nl> isolate - > SetMicrotasksPolicy ( v8 : : MicrotasksPolicy : : kExplicit ) ; <nl> TEST ( ModuleEvaluationTopLevelAwaitDynamicImport ) { <nl> CHECK_EQ ( promise - > State ( ) , v8 : : Promise : : kFulfilled ) ; <nl> } <nl> i : : FLAG_harmony_top_level_await = previous_top_level_await_flag_value ; <nl> - i : : FLAG_harmony_dynamic_import = previous_dynamic_import_flag_value ; <nl> } <nl> <nl> TEST ( ModuleEvaluationTopLevelAwaitDynamicImportError ) { <nl> bool previous_top_level_await_flag_value = i : : FLAG_harmony_top_level_await ; <nl> - bool previous_dynamic_import_flag_value = i : : FLAG_harmony_dynamic_import ; <nl> i : : FLAG_harmony_top_level_await = true ; <nl> - i : : FLAG_harmony_dynamic_import = true ; <nl> Isolate * isolate = CcTest : : isolate ( ) ; <nl> HandleScope scope ( isolate ) ; <nl> isolate - > SetMicrotasksPolicy ( v8 : : MicrotasksPolicy : : kExplicit ) ; <nl> TEST ( ModuleEvaluationTopLevelAwaitDynamicImportError ) { <nl> CHECK ( ! try_catch . HasCaught ( ) ) ; <nl> } <nl> i : : FLAG_harmony_top_level_await = previous_top_level_await_flag_value ; <nl> - i : : FLAG_harmony_dynamic_import = previous_dynamic_import_flag_value ; <nl> } <nl> <nl> TEST ( TerminateExecutionTopLevelAwaitSync ) { <nl> mmm a / test / cctest / test - parsing . cc <nl> ppp b / test / cctest / test - parsing . cc <nl> enum ParserFlag { <nl> kAllowLazy , <nl> kAllowNatives , <nl> kAllowHarmonyPrivateMethods , <nl> - kAllowHarmonyDynamicImport , <nl> kAllowHarmonyImportMeta , <nl> kAllowHarmonyLogicalAssignment , <nl> } ; <nl> enum ParserSyncTestResult { <nl> void SetGlobalFlags ( base : : EnumSet < ParserFlag > flags ) { <nl> i : : FLAG_allow_natives_syntax = flags . contains ( kAllowNatives ) ; <nl> i : : FLAG_harmony_private_methods = flags . contains ( kAllowHarmonyPrivateMethods ) ; <nl> - i : : FLAG_harmony_dynamic_import = flags . contains ( kAllowHarmonyDynamicImport ) ; <nl> i : : FLAG_harmony_import_meta = flags . contains ( kAllowHarmonyImportMeta ) ; <nl> i : : FLAG_harmony_logical_assignment = <nl> flags . contains ( kAllowHarmonyLogicalAssignment ) ; <nl> void SetParserFlags ( i : : UnoptimizedCompileFlags * compile_flags , <nl> compile_flags - > set_allow_natives_syntax ( flags . contains ( kAllowNatives ) ) ; <nl> compile_flags - > set_allow_harmony_private_methods ( <nl> flags . contains ( kAllowHarmonyPrivateMethods ) ) ; <nl> - compile_flags - > set_allow_harmony_dynamic_import ( <nl> - flags . contains ( kAllowHarmonyDynamicImport ) ) ; <nl> compile_flags - > set_allow_harmony_import_meta ( <nl> flags . contains ( kAllowHarmonyImportMeta ) ) ; <nl> compile_flags - > set_allow_harmony_logical_assignment ( <nl> TEST ( ImportExpressionSuccess ) { <nl> <nl> / / clang - format on <nl> <nl> - / / We ignore test error messages because the error message from the <nl> - / / parser / preparser is different for the same data depending on the <nl> - / / context . <nl> - / / For example , a top level " import ( " is parsed as an <nl> - / / import declaration . The parser parses the import token correctly <nl> - / / and then shows an " Unexpected token ' ( ' " error message . The <nl> - / / preparser does not understand the import keyword ( this test is <nl> - / / run without kAllowHarmonyDynamicImport flag ) , so this results in <nl> - / / an " Unexpected token ' import ' " error . <nl> - RunParserSyncTest ( context_data , data , kError ) ; <nl> - RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , nullptr , 0 , <nl> - nullptr , 0 , true , true ) ; <nl> - static const ParserFlag flags [ ] = { kAllowHarmonyDynamicImport } ; <nl> - RunParserSyncTest ( context_data , data , kSuccess , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> - RunModuleParserSyncTest ( context_data , data , kSuccess , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> + RunParserSyncTest ( context_data , data , kSuccess ) ; <nl> + RunModuleParserSyncTest ( context_data , data , kSuccess ) ; <nl> } <nl> <nl> TEST ( ImportExpressionErrors ) { <nl> TEST ( ImportExpressionErrors ) { <nl> <nl> / / clang - format on <nl> RunParserSyncTest ( context_data , data , kError ) ; <nl> - / / We ignore the error messages for the reason explained in the <nl> - / / ImportExpressionSuccess test . <nl> - RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , nullptr , 0 , <nl> - nullptr , 0 , true , true ) ; <nl> - static const ParserFlag flags [ ] = { kAllowHarmonyDynamicImport } ; <nl> - RunParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> <nl> / / We ignore test error messages because the error message from <nl> / / the parser / preparser is different for the same data depending <nl> TEST ( ImportExpressionErrors ) { <nl> / / correctly and then shows an " Unexpected end of input " error <nl> / / message because of the ' { ' . The preparser shows an " Unexpected <nl> / / token ' { ' " because it ' s not a valid token in a CallExpression . <nl> - RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> - arraysize ( flags ) , nullptr , 0 , true , true ) ; <nl> + RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , nullptr , 0 , <nl> + nullptr , 0 , true , true ) ; <nl> } <nl> <nl> { <nl> TEST ( ImportExpressionErrors ) { <nl> RunParserSyncTest ( context_data , data , kError ) ; <nl> RunModuleParserSyncTest ( context_data , data , kError ) ; <nl> <nl> - static const ParserFlag flags [ ] = { kAllowHarmonyDynamicImport } ; <nl> - RunParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> - RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> + RunParserSyncTest ( context_data , data , kError ) ; <nl> + RunModuleParserSyncTest ( context_data , data , kError ) ; <nl> } <nl> <nl> / / Import statements as arrow function params and destructuring targets . <nl> TEST ( ImportExpressionErrors ) { <nl> RunParserSyncTest ( context_data , data , kError ) ; <nl> RunModuleParserSyncTest ( context_data , data , kError ) ; <nl> <nl> - static const ParserFlag flags [ ] = { kAllowHarmonyDynamicImport } ; <nl> - RunParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> - RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> - arraysize ( flags ) ) ; <nl> + RunParserSyncTest ( context_data , data , kError ) ; <nl> + RunModuleParserSyncTest ( context_data , data , kError ) ; <nl> } <nl> } <nl> <nl> TEST ( ImportMetaSuccess ) { <nl> RunModuleParserSyncTest ( context_data , data , kError , nullptr , 0 , nullptr , 0 , <nl> nullptr , 0 , true , true ) ; <nl> <nl> - static const ParserFlag flags [ ] = { <nl> - kAllowHarmonyImportMeta , kAllowHarmonyDynamicImport , <nl> - } ; <nl> + static const ParserFlag flags [ ] = { kAllowHarmonyImportMeta } ; <nl> / / 2 . 1 . 1 Static Semantics : Early Errors <nl> / / ImportMeta <nl> / / * It is an early Syntax Error if Module is not the syntactic goal symbol . <nl> TEST ( ImportMetaFailure ) { <nl> <nl> / / clang - format on <nl> <nl> - static const ParserFlag flags [ ] = { <nl> - kAllowHarmonyImportMeta , kAllowHarmonyDynamicImport , <nl> - } ; <nl> + static const ParserFlag flags [ ] = { kAllowHarmonyImportMeta } ; <nl> <nl> RunParserSyncTest ( context_data , data , kError , nullptr , 0 , flags , <nl> arraysize ( flags ) ) ; <nl> mmm a / test / message / fail / dynamic - import - missing - specifier . js <nl> ppp b / test / message / fail / dynamic - import - missing - specifier . js <nl> <nl> / / Copyright 2016 the V8 project authors . All rights reserved . <nl> / / Use of this source code is governed by a BSD - style license that can be <nl> / / found in the LICENSE file . <nl> - / / <nl> - / / Flags : - - harmony - dynamic - import <nl> <nl> import ( ) ; <nl> mmm a / test / message / fail / dynamic - import - missing - specifier . out <nl> ppp b / test / message / fail / dynamic - import - missing - specifier . out <nl> <nl> - * % ( basename ) s : 7 : SyntaxError : import ( ) requires a specifier <nl> + * % ( basename ) s : 5 : SyntaxError : import ( ) requires a specifier <nl> import ( ) ; <nl> ^ <nl> SyntaxError : import ( ) requires a specifier <nl>
|
[ flags ] Remove - - harmony - dynamic - import
|
v8/v8
|
49dc0e311ad6229feb1f77e6e0683d04c5b660b4
|
2020-11-03T17:11:52Z
|
mmm a / addons / resource . language . en_gb / resources / strings . po <nl> ppp b / addons / resource . language . en_gb / resources / strings . po <nl> msgstr " " <nl> # . Description of setting with label # 39011 " Maximum wait time for network " <nl> # : system / settings / settings . xml <nl> msgctxt " # 39012 " <nl> - msgid " Set the maximum time to wait for the network to come up after waking up . When time has passed before network is up startup will continue . " <nl> + msgid " Set the maximum time to wait for the network to come up after starting or waking up . When time has passed before network is up startup will continue . " <nl> msgstr " " <nl> mmm a / system / settings / settings . xml <nl> ppp b / system / settings / settings . xml <nl> <nl> < / constraints > <nl> < control type = " list " format = " string " / > <nl> < / setting > <nl> - < setting id = " powermanagement . waitnetafterwakeup " type = " integer " label = " 39011 " help = " 39012 " > <nl> + < setting id = " powermanagement . waitfornetwork " type = " integer " label = " 39011 " help = " 39012 " > <nl> < level > 2 < / level > <nl> < default > 0 < / default > <nl> < constraints > <nl> mmm a / xbmc / Application . cpp <nl> ppp b / xbmc / Application . cpp <nl> bool CApplication : : Initialize ( ) <nl> g_peripherals . Initialise ( ) ; <nl> # endif <nl> <nl> + getNetwork ( ) . WaitForNet ( ) ; <nl> + <nl> / / Load curl so curl_global_init gets called before any service threads <nl> / / are started . Unloading will have no effect as curl is never fully unloaded . <nl> / / To quote man curl_global_init : <nl> mmm a / xbmc / network / Network . cpp <nl> ppp b / xbmc / network / Network . cpp <nl> <nl> # include < arpa / inet . h > <nl> <nl> # include " Network . h " <nl> + # include " ServiceBroker . h " <nl> # include " messaging / ApplicationMessenger . h " <nl> # include " network / NetworkServices . h " <nl> + # include " settings / Settings . h " <nl> # include " utils / log . h " <nl> # ifdef TARGET_WINDOWS <nl> # include " utils / SystemInfo . h " <nl> # include " platform / win32 / WIN32Util . h " <nl> # include " utils / CharsetConverter . h " <nl> # endif <nl> + # ifdef TARGET_POSIX <nl> + # include " linux / XTimeUtils . h " <nl> + # endif <nl> # include " utils / StringUtils . h " <nl> <nl> using namespace KODI : : MESSAGING ; <nl> int CreateTCPServerSocket ( const int port , const bool bindLocal , const int backlo <nl> return sock ; <nl> } <nl> <nl> + void CNetwork : : WaitForNet ( ) <nl> + { <nl> + const int timeout = CServiceBroker : : GetSettings ( ) . GetInt ( CSettings : : SETTING_POWERMANAGEMENT_WAITFORNETWORK ) ; <nl> + if ( timeout < = 0 ) <nl> + return ; / / wait for network is disabled <nl> + <nl> + / / check if we have at least one network interface to wait for <nl> + if ( ! IsAvailable ( ) ) <nl> + return ; <nl> + <nl> + CLog : : Log ( LOGNOTICE , " % s : Waiting for a network interface to come up ( Timeout : % d s ) " , __FUNCTION__ , timeout ) ; <nl> + <nl> + const static int intervalMs = 200 ; <nl> + const int numMaxTries = ( timeout * 1000 ) / intervalMs ; <nl> + <nl> + for ( int i = 0 ; i < numMaxTries ; + + i ) <nl> + { <nl> + if ( i > 0 ) <nl> + Sleep ( intervalMs ) ; <nl> + <nl> + if ( IsConnected ( ) ) <nl> + { <nl> + CLog : : Log ( LOGNOTICE , " % s : A network interface is up after waiting % d ms " , __FUNCTION__ , i * intervalMs ) ; <nl> + return ; <nl> + } <nl> + } <nl> + <nl> + CLog : : Log ( LOGNOTICE , " % s : No network interface did come up within % d s . . . Giving up . . . " , __FUNCTION__ , timeout ) ; <nl> + } <nl> mmm a / xbmc / network / Network . h <nl> ppp b / xbmc / network / Network . h <nl> class CNetwork <nl> <nl> / / Return true if given name or ip address corresponds to localhost <nl> bool IsLocalHost ( const std : : string & hostname ) ; <nl> + <nl> + / / Waits for the first network interface to become available <nl> + void WaitForNet ( ) ; <nl> } ; <nl> <nl> # ifdef HAS_LINUX_NETWORK <nl> mmm a / xbmc / powermanagement / PowerManager . cpp <nl> ppp b / xbmc / powermanagement / PowerManager . cpp <nl> <nl> extern HWND g_hWnd ; <nl> # endif <nl> <nl> - # if defined ( TARGET_POSIX ) <nl> - # include " linux / XTimeUtils . h " <nl> - # endif <nl> - <nl> using namespace ANNOUNCEMENT ; <nl> <nl> CPowerManager g_powerManager ; <nl> void CPowerManager : : OnWake ( ) <nl> { <nl> CLog : : Log ( LOGNOTICE , " % s : Running resume jobs " , __FUNCTION__ ) ; <nl> <nl> - { <nl> - const int waitNetTimeout = CServiceBroker : : GetSettings ( ) . GetInt ( CSettings : : SETTING_POWERMANAGEMENT_WAITNETAFTERWAKEUP ) ; <nl> - if ( waitNetTimeout > 0 ) <nl> - WaitForNet ( waitNetTimeout ) ; <nl> - } <nl> + g_application . getNetwork ( ) . WaitForNet ( ) ; <nl> <nl> / / reset out timers <nl> g_application . ResetShutdownTimers ( ) ; <nl> void CPowerManager : : SettingOptionsShutdownStatesFiller ( const CSetting * setting , <nl> # endif <nl> } <nl> } <nl> - <nl> - void CPowerManager : : WaitForNet ( int timeout ) const <nl> - { <nl> - CNetwork & net = g_application . getNetwork ( ) ; <nl> - <nl> - / / check if we have at least one network interface to wait for <nl> - if ( ! net . IsAvailable ( ) ) <nl> - return ; <nl> - <nl> - CLog : : Log ( LOGNOTICE , " % s : Waiting for a network interface to come up ( Timeout : % d s ) " , __FUNCTION__ , timeout ) ; <nl> - <nl> - const static int intervalMs = 200 ; <nl> - const int numMaxTries = ( timeout * 1000 ) / intervalMs ; <nl> - <nl> - for ( int i = 0 ; i < numMaxTries ; + + i ) <nl> - { <nl> - if ( i > 0 ) <nl> - Sleep ( intervalMs ) ; <nl> - <nl> - if ( net . IsConnected ( ) ) <nl> - { <nl> - CLog : : Log ( LOGNOTICE , " % s : A network interface is up after waiting % d ms " , __FUNCTION__ , i * intervalMs ) ; <nl> - return ; <nl> - } <nl> - } <nl> - <nl> - CLog : : Log ( LOGNOTICE , " % s : No network interface did come up within % d s . . . Giving up . . . " , __FUNCTION__ , timeout ) ; <nl> - } <nl> mmm a / xbmc / powermanagement / PowerManager . h <nl> ppp b / xbmc / powermanagement / PowerManager . h <nl> class CPowerManager : public IPowerEventsCallback <nl> <nl> void OnLowBattery ( ) ; <nl> <nl> - void WaitForNet ( int timeout ) const ; <nl> - <nl> IPowerSyscall * m_instance ; <nl> } ; <nl> <nl> mmm a / xbmc / settings / Settings . cpp <nl> ppp b / xbmc / settings / Settings . cpp <nl> const std : : string CSettings : : SETTING_POWERMANAGEMENT_DISPLAYSOFF = " powermanagem <nl> const std : : string CSettings : : SETTING_POWERMANAGEMENT_SHUTDOWNTIME = " powermanagement . shutdowntime " ; <nl> const std : : string CSettings : : SETTING_POWERMANAGEMENT_SHUTDOWNSTATE = " powermanagement . shutdownstate " ; <nl> const std : : string CSettings : : SETTING_POWERMANAGEMENT_WAKEONACCESS = " powermanagement . wakeonaccess " ; <nl> - const std : : string CSettings : : SETTING_POWERMANAGEMENT_WAITNETAFTERWAKEUP = " powermanagement . waitnetafterwakeup " ; <nl> + const std : : string CSettings : : SETTING_POWERMANAGEMENT_WAITFORNETWORK = " powermanagement . waitfornetwork " ; <nl> const std : : string CSettings : : SETTING_DEBUG_SHOWLOGINFO = " debug . showloginfo " ; <nl> const std : : string CSettings : : SETTING_DEBUG_EXTRALOGGING = " debug . extralogging " ; <nl> const std : : string CSettings : : SETTING_DEBUG_SETEXTRALOGLEVEL = " debug . setextraloglevel " ; <nl> mmm a / xbmc / settings / Settings . h <nl> ppp b / xbmc / settings / Settings . h <nl> class CSettings : public CSettingCreator , public CSettingControlCreator <nl> static const std : : string SETTING_POWERMANAGEMENT_SHUTDOWNTIME ; <nl> static const std : : string SETTING_POWERMANAGEMENT_SHUTDOWNSTATE ; <nl> static const std : : string SETTING_POWERMANAGEMENT_WAKEONACCESS ; <nl> - static const std : : string SETTING_POWERMANAGEMENT_WAITNETAFTERWAKEUP ; <nl> + static const std : : string SETTING_POWERMANAGEMENT_WAITFORNETWORK ; <nl> static const std : : string SETTING_DEBUG_SHOWLOGINFO ; <nl> static const std : : string SETTING_DEBUG_EXTRALOGGING ; <nl> static const std : : string SETTING_DEBUG_SETEXTRALOGLEVEL ; <nl>
|
Merge pull request from verybadsoldier / wait_net_on_startup
|
xbmc/xbmc
|
2255184e4a6999bcaeaf8045c2165fd21fc8a173
|
2017-01-04T07:37:26Z
|
mmm a / src / mongo / db / repl / data_replicator_test . cpp <nl> ppp b / src / mongo / db / repl / data_replicator_test . cpp <nl> TEST_F ( InitialSyncTest , DataReplicatorPassesThroughOplogFetcherFailure ) { <nl> " { ts : Timestamp ( 1 , 1 ) , h : NumberLong ( 1 ) , ns : ' a . a ' , v : " <nl> < < OplogEntry : : kOplogVersion <nl> < < " , op : ' i ' , o : { _id : 1 , a : 1 } } ] } } " ) } , <nl> - / / Clone Start <nl> - / / listDatabases <nl> - { " listDatabases " , fromjson ( " { ok : 1 , databases : [ { name : ' a ' } ] } " ) } , <nl> } ; <nl> <nl> startSync ( 0 ) ; <nl> <nl> - / / Set to a high enough number to ensure we have a pending getMore request in the queue after <nl> - / / responding to the listDatabases request . <nl> - numGetMoreOplogEntriesMax = 20 ; <nl> - <nl> setResponses ( responses ) ; <nl> playResponses ( ) ; <nl> - log ( ) < < " done playing responses - both oplog fetcher and databases cloner are active " ; <nl> - <nl> - ASSERT_LESS_THAN ( numGetMoreOplogEntries , numGetMoreOplogEntriesMax ) ; <nl> + log ( ) < < " done playing responses - oplog fetcher is active " ; <nl> <nl> { <nl> auto net = getNet ( ) ; <nl> TEST_F ( InitialSyncTest , DataReplicatorPassesThroughOplogFetcherFailure ) { <nl> net - > runReadyNetworkOperations ( ) ; <nl> } <nl> <nl> - / / Shut executor down and wait for initial sync thread to return with final status . <nl> - getExecutor ( ) . shutdown ( ) ; <nl> - <nl> verifySync ( getNet ( ) , ErrorCodes : : OperationFailed ) ; <nl> } <nl> <nl>
|
SERVER - 25637 fixed DataReplicatorPassesThroughOplogFetcherFailure to respond to first getMore request with error status
|
mongodb/mongo
|
abdbc60c6267f1a32bcedb76c49ec832554ef497
|
2016-08-23T14:17:22Z
|
mmm a / . gitignore <nl> ppp b / . gitignore <nl> report . xml <nl> <nl> # port server log <nl> portlog . txt <nl> + <nl> + # Xcode <nl> + build / <nl> + * . pbxuser <nl> + ! default . pbxuser <nl> + * . mode1v3 <nl> + ! default . mode1v3 <nl> + * . mode2v3 <nl> + ! default . mode2v3 <nl> + * . perspectivev3 <nl> + ! default . perspectivev3 <nl> + xcuserdata <nl> + * . xccheckout <nl> + * . moved - aside <nl> + DerivedData <nl> + * . hmap <nl> + * . ipa <nl> + * . xcuserstate <nl> + * . DS_Store <nl> deleted file mode 100644 <nl> index 15110668007 . . 00000000000 <nl> mmm a / src / objective - c / . gitignore <nl> ppp / dev / null <nl> <nl> - # Xcode <nl> - # <nl> - build / <nl> - * . pbxuser <nl> - ! default . pbxuser <nl> - * . mode1v3 <nl> - ! default . mode1v3 <nl> - * . mode2v3 <nl> - ! default . mode2v3 <nl> - * . perspectivev3 <nl> - ! default . perspectivev3 <nl> - xcuserdata <nl> - * . xccheckout <nl> - * . moved - aside <nl> - DerivedData <nl> - * . hmap <nl> - * . ipa <nl> - * . xcuserstate <nl> - * . DS_Store <nl> \ No newline at end of file <nl>
|
Git ignore XCode derived files across the repo
|
grpc/grpc
|
740a1cc7c34e4e750cfd6b9dfaca30a6f90c8123
|
2015-10-13T01:44:08Z
|
mmm a / jstests / core / copydb . js <nl> ppp b / jstests / core / copydb . js <nl> <nl> + / / Basic tests for the copydb command . These only test copying from the same server ; these do not <nl> + / / test the ability of copydb to pull a database from another server ( with or without auth ) . <nl> <nl> - a = db . getSisterDB ( " copydb - test - a " ) ; <nl> - b = db . getSisterDB ( " copydb - test - b " ) ; <nl> + / / Test basic command usage . <nl> + var db1 = db . getSisterDB ( " copydb - test - db1 " ) ; <nl> + var db2 = db . getSisterDB ( " copydb - test - db2 " ) ; <nl> + assert . commandWorked ( db1 . dropDatabase ( ) ) ; <nl> + assert . commandWorked ( db2 . dropDatabase ( ) ) ; <nl> + assert . writeOK ( db1 . foo . save ( { db1 : 1 } ) ) ; <nl> + assert . commandWorked ( db1 . foo . ensureIndex ( { db1 : 1 } ) ) ; <nl> + assert . eq ( 1 , db1 . foo . count ( ) , " A " ) ; <nl> + assert . eq ( 0 , db2 . foo . count ( ) , " B " ) ; <nl> + assert . commandWorked ( db1 . copyDatabase ( db1 . _name , db2 . _name ) ) ; <nl> + assert . eq ( 1 , db1 . foo . count ( ) , " C " ) ; <nl> + assert . eq ( 1 , db2 . foo . count ( ) , " D " ) ; <nl> + assert . eq ( db1 . foo . getIndexes ( ) . length , db2 . foo . getIndexes ( ) . length ) ; <nl> <nl> - a . dropDatabase ( ) ; <nl> - b . dropDatabase ( ) ; <nl> - <nl> - a . foo . save ( { a : 1 } ) ; <nl> - a . foo . ensureIndex ( { a : 1 } ) ; <nl> - <nl> - assert . eq ( 1 , a . foo . count ( ) , " A " ) ; <nl> - assert . eq ( 0 , b . foo . count ( ) , " B " ) ; <nl> - <nl> - a . copyDatabase ( a . _name , b . _name ) ; <nl> - <nl> - assert . eq ( 1 , a . foo . count ( ) , " C " ) ; <nl> - assert . eq ( 1 , b . foo . count ( ) , " D " ) ; <nl> - <nl> - assert . eq ( a . foo . getIndexes ( ) . length , <nl> - b . foo . getIndexes ( ) . length ) ; <nl> + / / Test command input validation . <nl> + assert . commandFailed ( db1 . adminCommand ( { copydb : 1 , <nl> + fromdb : db1 . getName ( ) , <nl> + todb : " copydb . invalid " } ) ) ; / / Name can ' t contain dot . <nl> mmm a / src / mongo / db / commands / copydb . cpp <nl> ppp b / src / mongo / db / commands / copydb . cpp <nl> namespace mongo { <nl> return false ; <nl> } <nl> <nl> + if ( ! NamespaceString : : validDBName ( todb ) ) { <nl> + errmsg = " invalid todb name : " + todb ; <nl> + return false ; <nl> + } <nl> + <nl> Cloner cloner ; <nl> string username = cmdObj . getStringField ( " username " ) ; <nl> string nonce = cmdObj . getStringField ( " nonce " ) ; <nl>
|
SERVER - 15280 Validate copydb command " todb " field
|
mongodb/mongo
|
050c963ea58b4fb02dde7ddc70d4cdc6afc3d501
|
2014-10-10T23:31:59Z
|
mmm a / modules / planning / tasks / optimizers / open_space_trajectory_partition / open_space_trajectory_partition . cc <nl> ppp b / modules / planning / tasks / optimizers / open_space_trajectory_partition / open_space_trajectory_partition . cc <nl> void OpenSpaceTrajectoryPartition : : PartitionTrajectory ( <nl> } <nl> } <nl> / / Partition trajectory points into each trajectory <nl> - constexpr double kGearShiftEpsilon = 0 . 5 ; <nl> + constexpr double kGearShiftEpsilon = 0 . 0 ; <nl> double distance_s = 0 . 0 ; <nl> for ( size_t i = 0 ; i < horizon ; + + i ) { <nl> / / shift from GEAR_DRIVE to GEAR_REVERSE if v < 0 <nl>
|
Planning : openspace : fix chart visual problem
|
ApolloAuto/apollo
|
26be290b9c0c49040b3cb399bf487b83c9c5dbcc
|
2019-04-11T01:27:34Z
|
mmm a / hphp / compiler / option . cpp <nl> ppp b / hphp / compiler / option . cpp <nl> void Option : : Load ( const IniSetting : : Map & ini , Hdf & config ) { <nl> <nl> Config : : Bind ( ParserThreadCount , ini , config , " ParserThreadCount " , 0 ) ; <nl> if ( ParserThreadCount < = 0 ) { <nl> - ParserThreadCount = std : : max ( 1 , Process : : GetCPUCount ( ) / 2 ) ; <nl> + ParserThreadCount = Process : : GetCPUCount ( ) ; <nl> } <nl> <nl> / / Just to silence warnings until we remove them from various config files <nl> mmm a / hphp / runtime / base / runtime - option . h <nl> ppp b / hphp / runtime / base / runtime - option . h <nl> struct RuntimeOption { <nl> / * The command to invoke to spawn hh_single_compile in server mode . * / \ <nl> F ( string , HackCompilerCommand , hackCompilerCommandDefault ( ) ) \ <nl> / * The number of hh_single_compile daemons to keep alive . * / \ <nl> - F ( uint64_t , HackCompilerWorkers , std : : max ( 1 , Process : : GetCPUCount ( ) / 2 ) ) \ <nl> + F ( uint64_t , HackCompilerWorkers , Process : : GetCPUCount ( ) ) \ <nl> / * The number of times to retry after an infra failure communicating <nl> with a compiler process . * / \ <nl> F ( uint64_t , HackCompilerMaxRetries , 0 ) \ <nl>
|
Revert " D13225280 : Limit parser thread count to only physical cores "
|
facebook/hhvm
|
4a670b7da2fb1b25971c3e4cb49d3e6ad4284ada
|
2019-01-31T10:15:52Z
|
mmm a / libraries / ESP8266WebServer / src / ESP8266WebServer . cpp <nl> ppp b / libraries / ESP8266WebServer / src / ESP8266WebServer . cpp <nl> bool ESP8266WebServer : : hasArg ( const char * name ) { <nl> return false ; <nl> } <nl> <nl> + String ESP8266WebServer : : hostHeader ( ) { <nl> + return _hostHeader ; <nl> + } <nl> + <nl> void ESP8266WebServer : : onFileUpload ( THandlerFunction fn ) { <nl> _fileUploadHandler = fn ; <nl> } <nl> mmm a / libraries / ESP8266WebServer / src / ESP8266WebServer . h <nl> ppp b / libraries / ESP8266WebServer / src / ESP8266WebServer . h <nl> class ESP8266WebServer <nl> int args ( ) ; / / get arguments count <nl> bool hasArg ( const char * name ) ; / / check if argument exists <nl> <nl> + String hostHeader ( ) ; / / get request host header if available or empty String if not <nl> + <nl> / / send response to the client <nl> / / code - HTTP response code , can be 200 or 404 <nl> / / content_type - HTTP content type , like " text / plain " or " image / png " <nl> template < typename T > size_t streamFile ( T & file , const String & contentType ) { <nl> size_t _contentLength ; <nl> String _responseHeaders ; <nl> <nl> + String _hostHeader ; <nl> + <nl> RequestHandler * _firstHandler ; <nl> RequestHandler * _lastHandler ; <nl> THandlerFunction _notFoundHandler ; <nl> mmm a / libraries / ESP8266WebServer / src / Parsing . cpp <nl> ppp b / libraries / ESP8266WebServer / src / Parsing . cpp <nl> bool ESP8266WebServer : : _parseRequest ( WiFiClient & client ) { <nl> } <nl> headerName = req . substring ( 0 , headerDiv ) ; <nl> headerValue = req . substring ( headerDiv + 2 ) ; <nl> + <nl> + # ifdef DEBUG <nl> + DEBUG_OUTPUT . print ( " headerName : " ) ; <nl> + DEBUG_OUTPUT . println ( headerName ) ; <nl> + DEBUG_OUTPUT . print ( " headerValue : " ) ; <nl> + DEBUG_OUTPUT . println ( headerValue ) ; <nl> + # endif <nl> + <nl> if ( headerName = = " Content - Type " ) { <nl> if ( headerValue . startsWith ( " text / plain " ) ) { <nl> isForm = false ; <nl> bool ESP8266WebServer : : _parseRequest ( WiFiClient & client ) { <nl> } <nl> } else if ( headerName = = " Content - Length " ) { <nl> contentLength = headerValue . toInt ( ) ; <nl> - Serial . printf ( " Content - Length : % d \ r \ n " , contentLength ) ; <nl> + } else if ( headerName = = " Host " ) { <nl> + _hostHeader = headerValue ; <nl> } <nl> } <nl> <nl> bool ESP8266WebServer : : _parseRequest ( WiFiClient & client ) { <nl> } <nl> } <nl> } else { <nl> + String headerName ; <nl> + String headerValue ; <nl> + / / parse headers <nl> + while ( 1 ) { <nl> + req = client . readStringUntil ( ' \ r ' ) ; <nl> + client . readStringUntil ( ' \ n ' ) ; <nl> + if ( req = = " " ) break ; / / no moar headers <nl> + int headerDiv = req . indexOf ( ' : ' ) ; <nl> + if ( headerDiv = = - 1 ) { <nl> + break ; <nl> + } <nl> + headerName = req . substring ( 0 , headerDiv ) ; <nl> + headerValue = req . substring ( headerDiv + 2 ) ; <nl> + <nl> + # ifdef DEBUG <nl> + DEBUG_OUTPUT . print ( " headerName : " ) ; <nl> + DEBUG_OUTPUT . println ( headerName ) ; <nl> + DEBUG_OUTPUT . print ( " headerValue : " ) ; <nl> + DEBUG_OUTPUT . println ( headerValue ) ; <nl> + # endif <nl> + <nl> + if ( headerName = = " Host " ) { <nl> + _hostHeader = headerValue ; <nl> + } <nl> + } <nl> _parseArguments ( searchStr ) ; <nl> } <nl> client . flush ( ) ; <nl>
|
Host header support
|
esp8266/Arduino
|
5a91c6661569f60f509d7bb401189379e51e9a7d
|
2015-08-19T10:20:01Z
|
mmm a / contrib / Python / cntk / examples / LSTM / seqcla . py <nl> ppp b / contrib / Python / cntk / examples / LSTM / seqcla . py <nl> def lstm_func ( output_dim , cell_dim , x , input_dim , prev_state_h , prev_state_c ) : <nl> <nl> # input gate ( t ) <nl> it_w = times ( parameter ( ( cell_dim , input_dim ) ) , x ) <nl> - it_b = parameter ( ( cell_dim , 1 ) ) <nl> + it_b = parameter ( ( cell_dim ) ) <nl> it_h = times ( parameter ( ( cell_dim , output_dim ) ) , prev_state_h ) <nl> - it_c = parameter ( ( cell_dim , 1 ) ) * prev_state_c <nl> - it = sigmoid ( it_w + it_b + it_h + it_c ) <nl> + it_c = parameter ( ( cell_dim ) ) * prev_state_c <nl> + it = sigmoid ( ( it_w + it_b + it_h + it_c ) , name = ' it ' ) <nl> <nl> # applied to tanh of input <nl> bit_w = times ( parameter ( ( cell_dim , input_dim ) ) , x ) <nl> bit_h = times ( parameter ( ( cell_dim , output_dim ) ) , prev_state_h ) <nl> - bit_b = parameter ( ( cell_dim , 1 ) ) <nl> + bit_b = parameter ( ( cell_dim ) ) <nl> bit = it * tanh ( bit_w + ( bit_h + bit_b ) ) <nl> <nl> # forget - me - not gate ( t ) <nl> ft_w = times ( parameter ( ( cell_dim , input_dim ) ) , x ) <nl> - ft_b = parameter ( ( cell_dim , 1 ) ) <nl> + ft_b = parameter ( ( cell_dim ) ) <nl> ft_h = times ( parameter ( ( cell_dim , output_dim ) ) , prev_state_h ) <nl> - ft_c = parameter ( ( cell_dim , 1 ) ) * prev_state_c <nl> - ft = sigmoid ( ft_w + ft_b + ft_h + ft_c ) <nl> + ft_c = parameter ( ( cell_dim ) ) * prev_state_c <nl> + ft = sigmoid ( ( ft_w + ft_b + ft_h + ft_c ) , name = ' ft ' ) <nl> <nl> # applied to cell ( t - 1 ) <nl> bft = ft * prev_state_c <nl> def lstm_func ( output_dim , cell_dim , x , input_dim , prev_state_h , prev_state_c ) : <nl> <nl> # output gate <nl> ot_w = times ( parameter ( ( cell_dim , input_dim ) ) , x ) <nl> - ot_b = parameter ( ( cell_dim , 1 ) ) <nl> + ot_b = parameter ( ( cell_dim ) ) <nl> ot_h = times ( parameter ( ( cell_dim , output_dim ) ) , prev_state_h ) <nl> - ot_c = parameter ( ( cell_dim , 1 ) ) * prev_state_c <nl> - ot = sigmoid ( ot_w + ot_b + ot_h + ot_c ) <nl> + ot_c = parameter ( ( cell_dim ) ) * prev_state_c <nl> + ot = sigmoid ( ( ot_w + ot_b + ot_h + ot_c ) , name = ' ot ' ) <nl> <nl> # applied to tanh ( cell ( t ) ) <nl> ht = ot * tanh ( ct ) <nl> def lstm_func ( output_dim , cell_dim , x , input_dim , prev_state_h , prev_state_c ) : <nl> def seqcla ( ) : <nl> <nl> # LSTM params <nl> - input_dim = 100 <nl> + input_dim = 50 <nl> output_dim = 128 <nl> cell_dim = 128 <nl> <nl> # model <nl> num_labels = 5 <nl> - vocab = 400001 <nl> - embed_dim = 100 <nl> + vocab = 2000 <nl> + embed_dim = 50 <nl> <nl> - training_filename = " G : \ BLIS \ seqcla \ sparse \ Train_CoarseType . tsv . s " <nl> - test_filename = " G : \ BLIS \ seqcla \ sparse \ Test_CoarseType . tsv . s " <nl> - <nl> - t = dynamic_axis ( ) <nl> + t = dynamic_axis ( name = ' t ' ) <nl> + # temporarily using cntk1 SpareInput because cntk2 ' s Input ( ) will simply allow sparse as a parameter <nl> features = cntk1 . SparseInput ( vocab , dynamicAxis = t , var_name = ' features ' ) <nl> labels = input ( num_labels , name = ' labels ' ) <nl> - <nl> - # train_reader = CNTKTextFormatReader ( training_filename ) <nl> - train_reader = CNTKTextFormatReader ( test_filename ) <nl> + <nl> + training_filename = " . . \ Train_sparse . txt " <nl> + train_reader = CNTKTextFormatReader ( training_filename ) <nl> <nl> # setup embedding matrix <nl> embedding = parameter ( ( embed_dim , vocab ) , learning_rate_multiplier = 0 . 0 , <nl> - init = ' fromFile ' , init_from_file_path = ' G : \ BLIS \ seqcla \ sparse \ glove . 6B . 100D . txt . s ' ) <nl> + init = ' fromFile ' , init_from_file_path = ' . . \ embeddingmatrix . txt ' ) <nl> <nl> # get the vector representing the word <nl> - sequence = times ( embedding , features ) <nl> + sequence = times ( embedding , features , name = ' sequence ' ) <nl> <nl> # add an LSTM layer <nl> L = lstm_layer ( output_dim , cell_dim , sequence , input_dim ) <nl> <nl> # get only the last hidden state <nl> - lst = Last ( L ) <nl> + lst = Last ( L , var_name = ' lst ' ) <nl> <nl> # add a softmax layer on top <nl> - w = parameter ( ( num_labels , output_dim ) ) <nl> - b = parameter ( ( num_labels , 1 ) ) <nl> - z = times ( w , lst ) + b <nl> + w = parameter ( ( num_labels , output_dim ) , name = ' w ' ) <nl> + b = parameter ( ( num_labels ) , name = ' b ' ) <nl> + z = plus ( times ( w , lst ) , b , name = ' z ' ) <nl> <nl> # and reconcile the shared dynamic axis <nl> - pred = reconcile_dynamic_axis ( z , labels ) <nl> + pred = reconcile_dynamic_axis ( z , labels , name = ' pred ' ) <nl> <nl> ce = cntk1 . CrossEntropyWithSoftmax ( labels , pred ) <nl> ce . tag = " criterion " <nl> <nl> - # my_sgd = SGDParams ( epoch_size = 0 , minibatch_size = 25 , learning_ratesPerMB = 0 . 1 , max_epochs = 3 ) <nl> + my_sgd = SGDParams ( epoch_size = 0 , minibatch_size = 25 , learning_ratesPerMB = 0 . 1 , max_epochs = 1 ) <nl> <nl> with Context ( ' seqcla ' , clean_up = False ) as ctx : <nl> - ctx . eval ( node = ce , <nl> - input_map = train_reader . map ( <nl> - features , alias = ' x ' , dim = vocab , format = ' Sparse ' ) . map ( <nl> - labels , alias = ' y ' , dim = num_labels , format = ' Dense ' ) ) <nl> + # ctx . eval ( node = ce , <nl> + # input_map = train_reader . map ( <nl> + # features , alias = ' x ' , dim = vocab , format = ' Sparse ' ) . map ( <nl> + # labels , alias = ' y ' , dim = num_labels , format = ' Dense ' ) ) <nl> <nl> - # ctx . train ( root_nodes = [ ce , ev ] , optimizer = my_sgd , input_reader = { features : f_reader , labels : l_reader } ) <nl> - # result = ctx . test ( input_reader = { features : f_reader , labels : l_reader } ) <nl> + ctx . train ( root_nodes = [ ce ] , optimizer = my_sgd , input_map = train_reader . map ( <nl> + features , alias = ' x ' , dim = vocab , format = ' Sparse ' ) . map ( <nl> + labels , alias = ' y ' , dim = num_labels , format = ' Dense ' ) ) <nl> <nl> <nl> if ( __name__ = = " __main__ " ) : <nl>
|
fixed LSTM example !
|
microsoft/CNTK
|
a21aa2a3eb03af19188ad4387681133da6a86c8d
|
2016-04-29T13:23:49Z
|
mmm a / test / js - perf - test / JSTests1 . json <nl> ppp b / test / js - perf - test / JSTests1 . json <nl> <nl> { <nl> - " owners " : [ " jarin @ chromium . org " , " mvstanston @ chromium . org " ] , <nl> + " owners " : [ " jarin @ chromium . org " , " mvstanton @ chromium . org " ] , <nl> " name " : " JSTests " , <nl> " run_count " : 3 , <nl> " run_count_arm " : 1 , <nl> mmm a / test / js - perf - test / JSTests2 . json <nl> ppp b / test / js - perf - test / JSTests2 . json <nl> <nl> { <nl> - " owners " : [ " jarin @ chromium . org " , " mvstanston @ chromium . org " ] , <nl> + " owners " : [ " jarin @ chromium . org " , " mvstanton @ chromium . org " ] , <nl> " name " : " JSTests " , <nl> " run_count " : 3 , <nl> " run_count_arm " : 1 , <nl> <nl> { <nl> " name " : " Array " , <nl> " path " : [ " Array " ] , <nl> + " timeout " : 180 , <nl> + " timeout_arm64 " : 360 , <nl> " main " : " run . js " , <nl> " resources " : [ <nl> " filter . js " , " map . js " , " every . js " , " join . js " , " some . js " , " reduce . js " , <nl> mmm a / test / js - perf - test / JSTests3 . json <nl> ppp b / test / js - perf - test / JSTests3 . json <nl> <nl> { <nl> - " owners " : [ " jarin @ chromium . org " , " mvstanston @ chromium . org " ] , <nl> + " owners " : [ " jarin @ chromium . org " , " mvstanton @ chromium . org " ] , <nl> " name " : " JSTests " , <nl> " run_count " : 3 , <nl> " run_count_arm " : 1 , <nl> mmm a / test / js - perf - test / JSTests4 . json <nl> ppp b / test / js - perf - test / JSTests4 . json <nl> <nl> { <nl> - " owners " : [ " jarin @ chromium . org " , " mvstanston @ chromium . org " ] , <nl> + " owners " : [ " jarin @ chromium . org " , " mvstanton @ chromium . org " ] , <nl> " name " : " JSTests " , <nl> " run_count " : 3 , <nl> " run_count_arm " : 1 , <nl> mmm a / test / js - perf - test / JSTests5 . json <nl> ppp b / test / js - perf - test / JSTests5 . json <nl> <nl> { <nl> - " owners " : [ " jarin @ chromium . org " , " mvstanston @ chromium . org " ] , <nl> + " owners " : [ " jarin @ chromium . org " , " mvstanton @ chromium . org " ] , <nl> " name " : " JSTests " , <nl> " run_count " : 3 , <nl> " run_count_arm " : 1 , <nl> mmm a / test / js - perf - test / SixSpeed . json <nl> ppp b / test / js - perf - test / SixSpeed . json <nl> <nl> { <nl> - " owners " : [ " jarin @ chromium . org " , " mvstanston @ chromium . org " ] , <nl> + " owners " : [ " jarin @ chromium . org " , " mvstanton @ chromium . org " ] , <nl> " name " : " SixSpeed " , <nl> " run_count " : 3 , <nl> " run_count_arm " : 1 , <nl>
|
Increase timeout for JSTests / Array test and fix Michael ' s username
|
v8/v8
|
9e9fb65ef23250d18053e8c2b99e764c74aa278b
|
2019-04-16T12:24:10Z
|
mmm a / android / filament - utils - android / src / main / java / com / google / android / filament / utils / Manipulator . java <nl> ppp b / android / filament - utils - android / src / main / java / com / google / android / filament / utils / Manipulator . java <nl> public void zoom ( int x , int y , float scrolldelta ) { <nl> / * * <nl> * Gets a handle that can be used to reset the manipulator back to its current position . <nl> * <nl> - * \ see jumpToBookmark <nl> + * @ see # jumpToBookmark ( Bookmark ) <nl> * / <nl> public Bookmark getCurrentBookmark ( ) { <nl> return new Bookmark ( nGetCurrentBookmark ( mNativeObject ) ) ; <nl> public Bookmark getHomeBookmark ( ) { <nl> / * * <nl> * Sets the manipulator position and orientation back to a stashed state . <nl> * <nl> - * \ see getCurrentBookmark , getHomeBookmark <nl> + * @ see # getCurrentBookmark ( ) <nl> + * @ see # getHomeBookmark ( ) <nl> * / <nl> public void jumpToBookmark ( Bookmark bookmark ) { <nl> nJumpToBookmark ( mNativeObject , bookmark . getNativeObject ( ) ) ; <nl>
|
Fix javadoc syntax
|
google/filament
|
16c65550bb5b0884cccae8ccfbf0e1aa919fab80
|
2020-01-17T01:27:06Z
|
mmm a / lang / src / python_bindings . cpp <nl> ppp b / lang / src / python_bindings . cpp <nl> void export_lang ( py : : module & m ) { <nl> is_nparray ) ; <nl> } ) ; <nl> <nl> + m . def ( " test_throw " , [ ] { <nl> + try { <nl> + throw IRModified ( ) ; <nl> + } catch ( IRModified ) { <nl> + TC_INFO ( " caught " ) ; <nl> + } <nl> + } ) ; <nl> / / Schedules <nl> m . def ( " parallelize " , Parallelize ) ; <nl> m . def ( " vectorize " , Vectorize ) ; <nl> mmm a / tests / python / test_llvm_struct . py <nl> ppp b / tests / python / test_llvm_struct . py <nl> <nl> <nl> def test_linear ( ) : <nl> ti . reset ( ) <nl> + <nl> + ti . core . test_throw ( ) <nl> + <nl> ti . cfg . use_llvm = True <nl> <nl> x = ti . var ( ti . i32 ) <nl> def place ( ) : <nl> ti . root . dense ( ti . i , n ) . place ( x ) <nl> ti . root . dense ( ti . i , n ) . place ( y ) <nl> <nl> - for i in range ( n ) : <nl> - x [ i ] = i <nl> - y [ i ] = i + 123 <nl> + @ ti . kernel <nl> + def func ( ) : <nl> + for i in range ( n ) : <nl> + x [ i ] = i <nl> + y [ i ] = i + 123 <nl> + <nl> + <nl> + ti . core . test_throw ( ) <nl> + # ti . runtime . materialize ( ) <nl> + ti . core . test_throw ( ) <nl> + func ( ) <nl> + ti . core . test_throw ( ) <nl> + <nl> <nl> for i in range ( n ) : <nl> assert x [ i ] = = i <nl> assert y [ i ] = = i + 123 <nl> - <nl> + <nl> def test_linear_repeated ( ) : <nl> for i in range ( 10 ) : <nl> test_linear ( ) <nl> + <nl> + test_linear_repeated ( ) <nl> <nl> def test_linear_nested ( ) : <nl> ti . reset ( ) <nl>
|
reproduce crash with kernel decl
|
taichi-dev/taichi
|
c9cf9f51e1b88225b7948390025972f37c0f5a54
|
2019-10-18T02:21:52Z
|
mmm a / ChangeLog <nl> ppp b / ChangeLog <nl> <nl> + 2009 - 07 - 09 : Version 1 . 2 . 13 <nl> + <nl> + Fixed issue 397 , issue 398 , and issue 399 . <nl> + <nl> + Added support for breakpoint groups . <nl> + <nl> + Fixed bugs introduced with the new global object representation . <nl> + <nl> + Fixed a few bugs in the ARM code generator . <nl> + <nl> + <nl> 2009 - 07 - 06 : Version 1 . 2 . 12 <nl> <nl> Added stack traces collection to Error objects accessible through <nl> mmm a / src / version . cc <nl> ppp b / src / version . cc <nl> <nl> / / cannot be changed without changing the SCons build script . <nl> # define MAJOR_VERSION 1 <nl> # define MINOR_VERSION 2 <nl> - # define BUILD_NUMBER 13 <nl> + # define BUILD_NUMBER 14 <nl> # define PATCH_LEVEL 0 <nl> # define CANDIDATE_VERSION true <nl> <nl>
|
Prepare to push version 1 . 2 . 13 to trunk .
|
v8/v8
|
b8eb6189bee0dc4b7b04731d563aef421733649f
|
2009-07-09T05:44:19Z
|
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> if ( DOXYGEN_FOUND ) <nl> ) <nl> endif ( DOXYGEN_FOUND ) <nl> <nl> - # make format <nl> + # make format - all <nl> ADD_CUSTOM_TARGET ( <nl> - format <nl> + format - all <nl> find osquery include tools \ ( - name " * . h " - o - name " * . cpp " - o - name " * . mm " \ ) - exec clang - format - i { } + <nl> WORKING_DIRECTORY $ { CMAKE_SOURCE_DIR } <nl> - COMMENT " Formatting code with clang - format " VERBATIM <nl> + COMMENT " Formatting all osquery code with clang - format " VERBATIM <nl> ) <nl> + <nl> + ADD_CUSTOM_TARGET ( <nl> + format <nl> + python tools / git - clang - format . py <nl> + WORKING_DIRECTORY $ { CMAKE_SOURCE_DIR } <nl> + COMMENT " Formatting code staged code changes with clang - format " VERBATIM <nl> + ) <nl> + <nl> new file mode 100644 <nl> index 0000000000 . . ddbf54a048 <nl> mmm / dev / null <nl> ppp b / tools / git - clang - format . py <nl> <nl> + # ! / usr / bin / env python <nl> + # <nl> + # = = = - git - clang - format - ClangFormat Git Integration mmmmmmmmm * - python - * - - = = = # <nl> + # <nl> + # The LLVM Compiler Infrastructure <nl> + # <nl> + # This file is distributed under the University of Illinois Open Source <nl> + # License . See LICENSE . TXT for details . <nl> + # <nl> + # = = = mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm = = = # <nl> + <nl> + r " " " <nl> + clang - format git integration <nl> + = = = = = = = = = = = = = = = = = = = = = = = = = = = = <nl> + <nl> + This file provides a clang - format integration for git . Put it somewhere in your <nl> + path and ensure that it is executable . Then , " git clang - format " will invoke <nl> + clang - format on the changes in current files or a specific commit . <nl> + <nl> + For further details , run : <nl> + git clang - format - h <nl> + <nl> + Requires Python 2 . 7 <nl> + " " " <nl> + <nl> + import argparse <nl> + import collections <nl> + import contextlib <nl> + import errno <nl> + import os <nl> + import re <nl> + import subprocess <nl> + import sys <nl> + <nl> + usage = ' git clang - format [ OPTIONS ] [ < commit > ] [ - - ] [ < file > . . . ] ' <nl> + <nl> + desc = ' ' ' <nl> + Run clang - format on all lines that differ between the working directory <nl> + and < commit > , which defaults to HEAD . Changes are only applied to the working <nl> + directory . <nl> + <nl> + The following git - config settings set the default of the corresponding option : <nl> + clangFormat . binary <nl> + clangFormat . commit <nl> + clangFormat . extension <nl> + clangFormat . style <nl> + ' ' ' <nl> + <nl> + # Name of the temporary index file in which save the output of clang - format . <nl> + # This file is created within the . git directory . <nl> + temp_index_basename = ' clang - format - index ' <nl> + <nl> + <nl> + Range = collections . namedtuple ( ' Range ' , ' start , count ' ) <nl> + <nl> + <nl> + def main ( ) : <nl> + config = load_git_config ( ) <nl> + <nl> + # In order to keep ' - - ' yet allow options after positionals , we need to <nl> + # check for ' - - ' ourselves . ( Setting nargs = ' * ' throws away the ' - - ' , while <nl> + # nargs = argparse . REMAINDER disallows options after positionals . ) <nl> + argv = sys . argv [ 1 : ] <nl> + try : <nl> + idx = argv . index ( ' - - ' ) <nl> + except ValueError : <nl> + dash_dash = [ ] <nl> + else : <nl> + dash_dash = argv [ idx : ] <nl> + argv = argv [ : idx ] <nl> + <nl> + default_extensions = ' , ' . join ( [ <nl> + # From clang / lib / Frontend / FrontendOptions . cpp , all lower case <nl> + ' c ' , ' h ' , # C <nl> + ' m ' , # ObjC <nl> + ' mm ' , # ObjC + + <nl> + ' cc ' , ' cp ' , ' cpp ' , ' c + + ' , ' cxx ' , ' hpp ' , # C + + <nl> + # Other languages that clang - format supports <nl> + ' proto ' , ' protodevel ' , # Protocol Buffers <nl> + ' js ' , # JavaScript <nl> + ] ) <nl> + <nl> + p = argparse . ArgumentParser ( <nl> + usage = usage , formatter_class = argparse . RawDescriptionHelpFormatter , <nl> + description = desc ) <nl> + p . add_argument ( ' - - binary ' , <nl> + default = config . get ( ' clangformat . binary ' , ' clang - format ' ) , <nl> + help = ' path to clang - format ' ) , <nl> + p . add_argument ( ' - - commit ' , <nl> + default = config . get ( ' clangformat . commit ' , ' HEAD ' ) , <nl> + help = ' default commit to use if none is specified ' ) , <nl> + p . add_argument ( ' - - diff ' , action = ' store_true ' , <nl> + help = ' print a diff instead of applying the changes ' ) <nl> + p . add_argument ( ' - - extensions ' , <nl> + default = config . get ( ' clangformat . extensions ' , <nl> + default_extensions ) , <nl> + help = ( ' comma - separated list of file extensions to format , ' <nl> + ' excluding the period and case - insensitive ' ) ) , <nl> + p . add_argument ( ' - f ' , ' - - force ' , action = ' store_true ' , <nl> + help = ' allow changes to unstaged files ' ) <nl> + p . add_argument ( ' - p ' , ' - - patch ' , action = ' store_true ' , <nl> + help = ' select hunks interactively ' ) <nl> + p . add_argument ( ' - q ' , ' - - quiet ' , action = ' count ' , default = 0 , <nl> + help = ' print less information ' ) <nl> + p . add_argument ( ' - - style ' , <nl> + default = config . get ( ' clangformat . style ' , None ) , <nl> + help = ' passed to clang - format ' ) , <nl> + p . add_argument ( ' - v ' , ' - - verbose ' , action = ' count ' , default = 0 , <nl> + help = ' print extra information ' ) <nl> + # We gather all the remaining positional arguments into ' args ' since we need <nl> + # to use some heuristics to determine whether or not < commit > was present . <nl> + # However , to print pretty messages , we make use of metavar and help . <nl> + p . add_argument ( ' args ' , nargs = ' * ' , metavar = ' < commit > ' , <nl> + help = ' revision from which to compute the diff ' ) <nl> + p . add_argument ( ' ignored ' , nargs = ' * ' , metavar = ' < file > . . . ' , <nl> + help = ' if specified , only consider differences in these files ' ) <nl> + opts = p . parse_args ( argv ) <nl> + <nl> + opts . verbose - = opts . quiet <nl> + del opts . quiet <nl> + <nl> + commit , files = interpret_args ( opts . args , dash_dash , opts . commit ) <nl> + changed_lines = compute_diff_and_extract_lines ( commit , files ) <nl> + if opts . verbose > = 1 : <nl> + ignored_files = set ( changed_lines ) <nl> + filter_by_extension ( changed_lines , opts . extensions . lower ( ) . split ( ' , ' ) ) <nl> + if opts . verbose > = 1 : <nl> + ignored_files . difference_update ( changed_lines ) <nl> + if ignored_files : <nl> + print ' Ignoring changes in the following files ( wrong extension ) : ' <nl> + for filename in ignored_files : <nl> + print ' ' , filename <nl> + if changed_lines : <nl> + print ' Running clang - format on the following files : ' <nl> + for filename in changed_lines : <nl> + print ' ' , filename <nl> + if not changed_lines : <nl> + print ' no modified files to format ' <nl> + return <nl> + # The computed diff outputs absolute paths , so we must cd before accessing <nl> + # those files . <nl> + cd_to_toplevel ( ) <nl> + old_tree = create_tree_from_workdir ( changed_lines ) <nl> + new_tree = run_clang_format_and_save_to_tree ( changed_lines , <nl> + binary = opts . binary , <nl> + style = opts . style ) <nl> + if opts . verbose > = 1 : <nl> + print ' old tree : ' , old_tree <nl> + print ' new tree : ' , new_tree <nl> + if old_tree = = new_tree : <nl> + if opts . verbose > = 0 : <nl> + print ' clang - format did not modify any files ' <nl> + elif opts . diff : <nl> + print_diff ( old_tree , new_tree ) <nl> + else : <nl> + changed_files = apply_changes ( old_tree , new_tree , force = opts . force , <nl> + patch_mode = opts . patch ) <nl> + if ( opts . verbose > = 0 and not opts . patch ) or opts . verbose > = 1 : <nl> + print ' changed files : ' <nl> + for filename in changed_files : <nl> + print ' ' , filename <nl> + <nl> + <nl> + def load_git_config ( non_string_options = None ) : <nl> + " " " Return the git configuration as a dictionary . <nl> + <nl> + All options are assumed to be strings unless in ` non_string_options ` , in which <nl> + is a dictionary mapping option name ( in lower case ) to either " - - bool " or <nl> + " - - int " . " " " <nl> + if non_string_options is None : <nl> + non_string_options = { } <nl> + out = { } <nl> + for entry in run ( ' git ' , ' config ' , ' - - list ' , ' - - null ' ) . split ( ' \ 0 ' ) : <nl> + if entry : <nl> + name , value = entry . split ( ' \ n ' , 1 ) <nl> + if name in non_string_options : <nl> + value = run ( ' git ' , ' config ' , non_string_options [ name ] , name ) <nl> + out [ name ] = value <nl> + return out <nl> + <nl> + <nl> + def interpret_args ( args , dash_dash , default_commit ) : <nl> + " " " Interpret ` args ` as " [ commit ] [ - - ] [ files . . . ] " and return ( commit , files ) . <nl> + <nl> + It is assumed that " - - " and everything that follows has been removed from <nl> + args and placed in ` dash_dash ` . <nl> + <nl> + If " - - " is present ( i . e . , ` dash_dash ` is non - empty ) , the argument to its <nl> + left ( if present ) is taken as commit . Otherwise , the first argument is <nl> + checked if it is a commit or a file . If commit is not given , <nl> + ` default_commit ` is used . " " " <nl> + if dash_dash : <nl> + if len ( args ) = = 0 : <nl> + commit = default_commit <nl> + elif len ( args ) > 1 : <nl> + die ( ' at most one commit allowed ; % d given ' % len ( args ) ) <nl> + else : <nl> + commit = args [ 0 ] <nl> + object_type = get_object_type ( commit ) <nl> + if object_type not in ( ' commit ' , ' tag ' ) : <nl> + if object_type is None : <nl> + die ( " ' % s ' is not a commit " % commit ) <nl> + else : <nl> + die ( " ' % s ' is a % s , but a commit was expected " % ( commit , object_type ) ) <nl> + files = dash_dash [ 1 : ] <nl> + elif args : <nl> + if disambiguate_revision ( args [ 0 ] ) : <nl> + commit = args [ 0 ] <nl> + files = args [ 1 : ] <nl> + else : <nl> + commit = default_commit <nl> + files = args <nl> + else : <nl> + commit = default_commit <nl> + files = [ ] <nl> + return commit , files <nl> + <nl> + <nl> + def disambiguate_revision ( value ) : <nl> + " " " Returns True if ` value ` is a revision , False if it is a file , or dies . " " " <nl> + # If ` value ` is ambiguous ( neither a commit nor a file ) , the following <nl> + # command will die with an appropriate error message . <nl> + run ( ' git ' , ' rev - parse ' , value , verbose = False ) <nl> + object_type = get_object_type ( value ) <nl> + if object_type is None : <nl> + return False <nl> + if object_type in ( ' commit ' , ' tag ' ) : <nl> + return True <nl> + die ( ' ` % s ` is a % s , but a commit or filename was expected ' % <nl> + ( value , object_type ) ) <nl> + <nl> + <nl> + def get_object_type ( value ) : <nl> + " " " Returns a string description of an object ' s type , or None if it is not <nl> + a valid git object . " " " <nl> + cmd = [ ' git ' , ' cat - file ' , ' - t ' , value ] <nl> + p = subprocess . Popen ( cmd , stdout = subprocess . PIPE , stderr = subprocess . PIPE ) <nl> + stdout , stderr = p . communicate ( ) <nl> + if p . returncode ! = 0 : <nl> + return None <nl> + return stdout . strip ( ) <nl> + <nl> + <nl> + def compute_diff_and_extract_lines ( commit , files ) : <nl> + " " " Calls compute_diff ( ) followed by extract_lines ( ) . " " " <nl> + diff_process = compute_diff ( commit , files ) <nl> + changed_lines = extract_lines ( diff_process . stdout ) <nl> + diff_process . stdout . close ( ) <nl> + diff_process . wait ( ) <nl> + if diff_process . returncode ! = 0 : <nl> + # Assume error was already printed to stderr . <nl> + sys . exit ( 2 ) <nl> + return changed_lines <nl> + <nl> + <nl> + def compute_diff ( commit , files ) : <nl> + " " " Return a subprocess object producing the diff from ` commit ` . <nl> + <nl> + The return value ' s ` stdin ` file object will produce a patch with the <nl> + differences between the working directory and ` commit ` , filtered on ` files ` <nl> + ( if non - empty ) . Zero context lines are used in the patch . " " " <nl> + cmd = [ ' git ' , ' diff - index ' , ' - p ' , ' - U0 ' , commit , ' - - ' ] <nl> + cmd . extend ( files ) <nl> + p = subprocess . Popen ( cmd , stdin = subprocess . PIPE , stdout = subprocess . PIPE ) <nl> + p . stdin . close ( ) <nl> + return p <nl> + <nl> + <nl> + def extract_lines ( patch_file ) : <nl> + " " " Extract the changed lines in ` patch_file ` . <nl> + <nl> + The return value is a dictionary mapping filename to a list of ( start_line , <nl> + line_count ) pairs . <nl> + <nl> + The input must have been produced with ` ` - U0 ` ` , meaning unidiff format with <nl> + zero lines of context . The return value is a dict mapping filename to a <nl> + list of line ` Range ` s . " " " <nl> + matches = { } <nl> + for line in patch_file : <nl> + match = re . search ( r ' ^ \ + \ + \ + \ [ ^ / ] + / ( . * ) ' , line ) <nl> + if match : <nl> + filename = match . group ( 1 ) . rstrip ( ' \ r \ n ' ) <nl> + match = re . search ( r ' ^ @ @ - [ 0 - 9 , ] + \ + ( \ d + ) ( , ( \ d + ) ) ? ' , line ) <nl> + if match : <nl> + start_line = int ( match . group ( 1 ) ) <nl> + line_count = 1 <nl> + if match . group ( 3 ) : <nl> + line_count = int ( match . group ( 3 ) ) <nl> + if line_count > 0 : <nl> + matches . setdefault ( filename , [ ] ) . append ( Range ( start_line , line_count ) ) <nl> + return matches <nl> + <nl> + <nl> + def filter_by_extension ( dictionary , allowed_extensions ) : <nl> + " " " Delete every key in ` dictionary ` that doesn ' t have an allowed extension . <nl> + <nl> + ` allowed_extensions ` must be a collection of lowercase file extensions , <nl> + excluding the period . " " " <nl> + allowed_extensions = frozenset ( allowed_extensions ) <nl> + for filename in dictionary . keys ( ) : <nl> + base_ext = filename . rsplit ( ' . ' , 1 ) <nl> + if len ( base_ext ) = = 1 or base_ext [ 1 ] . lower ( ) not in allowed_extensions : <nl> + del dictionary [ filename ] <nl> + <nl> + <nl> + def cd_to_toplevel ( ) : <nl> + " " " Change to the top level of the git repository . " " " <nl> + toplevel = run ( ' git ' , ' rev - parse ' , ' - - show - toplevel ' ) <nl> + os . chdir ( toplevel ) <nl> + <nl> + <nl> + def create_tree_from_workdir ( filenames ) : <nl> + " " " Create a new git tree with the given files from the working directory . <nl> + <nl> + Returns the object ID ( SHA - 1 ) of the created tree . " " " <nl> + return create_tree ( filenames , ' - - stdin ' ) <nl> + <nl> + <nl> + def run_clang_format_and_save_to_tree ( changed_lines , binary = ' clang - format ' , <nl> + style = None ) : <nl> + " " " Run clang - format on each file and save the result to a git tree . <nl> + <nl> + Returns the object ID ( SHA - 1 ) of the created tree . " " " <nl> + def index_info_generator ( ) : <nl> + for filename , line_ranges in changed_lines . iteritems ( ) : <nl> + mode = oct ( os . stat ( filename ) . st_mode ) <nl> + blob_id = clang_format_to_blob ( filename , line_ranges , binary = binary , <nl> + style = style ) <nl> + yield ' % s % s \ t % s ' % ( mode , blob_id , filename ) <nl> + return create_tree ( index_info_generator ( ) , ' - - index - info ' ) <nl> + <nl> + <nl> + def create_tree ( input_lines , mode ) : <nl> + " " " Create a tree object from the given input . <nl> + <nl> + If mode is ' - - stdin ' , it must be a list of filenames . If mode is <nl> + ' - - index - info ' is must be a list of values suitable for " git update - index <nl> + - - index - info " , such as " < mode > < SP > < sha1 > < TAB > < filename > " . Any other mode <nl> + is invalid . " " " <nl> + assert mode in ( ' - - stdin ' , ' - - index - info ' ) <nl> + cmd = [ ' git ' , ' update - index ' , ' - - add ' , ' - z ' , mode ] <nl> + with temporary_index_file ( ) : <nl> + p = subprocess . Popen ( cmd , stdin = subprocess . PIPE ) <nl> + for line in input_lines : <nl> + p . stdin . write ( ' % s \ 0 ' % line ) <nl> + p . stdin . close ( ) <nl> + if p . wait ( ) ! = 0 : <nl> + die ( ' ` % s ` failed ' % ' ' . join ( cmd ) ) <nl> + tree_id = run ( ' git ' , ' write - tree ' ) <nl> + return tree_id <nl> + <nl> + <nl> + def clang_format_to_blob ( filename , line_ranges , binary = ' clang - format ' , <nl> + style = None ) : <nl> + " " " Run clang - format on the given file and save the result to a git blob . <nl> + <nl> + Returns the object ID ( SHA - 1 ) of the created blob . " " " <nl> + clang_format_cmd = [ binary , filename ] <nl> + if style : <nl> + clang_format_cmd . extend ( [ ' - style = ' + style ] ) <nl> + clang_format_cmd . extend ( [ <nl> + ' - lines = % s : % s ' % ( start_line , start_line + line_count - 1 ) <nl> + for start_line , line_count in line_ranges ] ) <nl> + try : <nl> + clang_format = subprocess . Popen ( clang_format_cmd , stdin = subprocess . PIPE , <nl> + stdout = subprocess . PIPE ) <nl> + except OSError as e : <nl> + if e . errno = = errno . ENOENT : <nl> + die ( ' cannot find executable " % s " ' % binary ) <nl> + else : <nl> + raise <nl> + clang_format . stdin . close ( ) <nl> + hash_object_cmd = [ ' git ' , ' hash - object ' , ' - w ' , ' - - path = ' + filename , ' - - stdin ' ] <nl> + hash_object = subprocess . Popen ( hash_object_cmd , stdin = clang_format . stdout , <nl> + stdout = subprocess . PIPE ) <nl> + clang_format . stdout . close ( ) <nl> + stdout = hash_object . communicate ( ) [ 0 ] <nl> + if hash_object . returncode ! = 0 : <nl> + die ( ' ` % s ` failed ' % ' ' . join ( hash_object_cmd ) ) <nl> + if clang_format . wait ( ) ! = 0 : <nl> + die ( ' ` % s ` failed ' % ' ' . join ( clang_format_cmd ) ) <nl> + return stdout . rstrip ( ' \ r \ n ' ) <nl> + <nl> + <nl> + @ contextlib . contextmanager <nl> + def temporary_index_file ( tree = None ) : <nl> + " " " Context manager for setting GIT_INDEX_FILE to a temporary file and deleting <nl> + the file afterward . " " " <nl> + index_path = create_temporary_index ( tree ) <nl> + old_index_path = os . environ . get ( ' GIT_INDEX_FILE ' ) <nl> + os . environ [ ' GIT_INDEX_FILE ' ] = index_path <nl> + try : <nl> + yield <nl> + finally : <nl> + if old_index_path is None : <nl> + del os . environ [ ' GIT_INDEX_FILE ' ] <nl> + else : <nl> + os . environ [ ' GIT_INDEX_FILE ' ] = old_index_path <nl> + os . remove ( index_path ) <nl> + <nl> + <nl> + def create_temporary_index ( tree = None ) : <nl> + " " " Create a temporary index file and return the created file ' s path . <nl> + <nl> + If ` tree ` is not None , use that as the tree to read in . Otherwise , an <nl> + empty index is created . " " " <nl> + gitdir = run ( ' git ' , ' rev - parse ' , ' - - git - dir ' ) <nl> + path = os . path . join ( gitdir , temp_index_basename ) <nl> + if tree is None : <nl> + tree = ' - - empty ' <nl> + run ( ' git ' , ' read - tree ' , ' - - index - output = ' + path , tree ) <nl> + return path <nl> + <nl> + <nl> + def print_diff ( old_tree , new_tree ) : <nl> + " " " Print the diff between the two trees to stdout . " " " <nl> + # We use the porcelain ' diff ' and not plumbing ' diff - tree ' because the output <nl> + # is expected to be viewed by the user , and only the former does nice things <nl> + # like color and pagination . <nl> + subprocess . check_call ( [ ' git ' , ' diff ' , old_tree , new_tree , ' - - ' ] ) <nl> + <nl> + <nl> + def apply_changes ( old_tree , new_tree , force = False , patch_mode = False ) : <nl> + " " " Apply the changes in ` new_tree ` to the working directory . <nl> + <nl> + Bails if there are local changes in those files and not ` force ` . If <nl> + ` patch_mode ` , runs ` git checkout - - patch ` to select hunks interactively . " " " <nl> + changed_files = run ( ' git ' , ' diff - tree ' , ' - r ' , ' - z ' , ' - - name - only ' , old_tree , <nl> + new_tree ) . rstrip ( ' \ 0 ' ) . split ( ' \ 0 ' ) <nl> + if not force : <nl> + unstaged_files = run ( ' git ' , ' diff - files ' , ' - - name - status ' , * changed_files ) <nl> + if unstaged_files : <nl> + print > > sys . stderr , ( ' The following files would be modified but ' <nl> + ' have unstaged changes : ' ) <nl> + print > > sys . stderr , unstaged_files <nl> + print > > sys . stderr , ' Please commit , stage , or stash them first . ' <nl> + sys . exit ( 2 ) <nl> + if patch_mode : <nl> + # In patch mode , we could just as well create an index from the new tree <nl> + # and checkout from that , but then the user will be presented with a <nl> + # message saying " Discard . . . from worktree " . Instead , we use the old <nl> + # tree as the index and checkout from new_tree , which gives the slightly <nl> + # better message , " Apply . . . to index and worktree " . This is not quite <nl> + # right , since it won ' t be applied to the user ' s index , but oh well . <nl> + with temporary_index_file ( old_tree ) : <nl> + subprocess . check_call ( [ ' git ' , ' checkout ' , ' - - patch ' , new_tree ] ) <nl> + index_tree = old_tree <nl> + else : <nl> + with temporary_index_file ( new_tree ) : <nl> + run ( ' git ' , ' checkout - index ' , ' - a ' , ' - f ' ) <nl> + return changed_files <nl> + <nl> + <nl> + def run ( * args , * * kwargs ) : <nl> + stdin = kwargs . pop ( ' stdin ' , ' ' ) <nl> + verbose = kwargs . pop ( ' verbose ' , True ) <nl> + strip = kwargs . pop ( ' strip ' , True ) <nl> + for name in kwargs : <nl> + raise TypeError ( " run ( ) got an unexpected keyword argument ' % s ' " % name ) <nl> + p = subprocess . Popen ( args , stdout = subprocess . PIPE , stderr = subprocess . PIPE , <nl> + stdin = subprocess . PIPE ) <nl> + stdout , stderr = p . communicate ( input = stdin ) <nl> + if p . returncode = = 0 : <nl> + if stderr : <nl> + if verbose : <nl> + print > > sys . stderr , ' ` % s ` printed to stderr : ' % ' ' . join ( args ) <nl> + print > > sys . stderr , stderr . rstrip ( ) <nl> + if strip : <nl> + stdout = stdout . rstrip ( ' \ r \ n ' ) <nl> + return stdout <nl> + if verbose : <nl> + print > > sys . stderr , ' ` % s ` returned % s ' % ( ' ' . join ( args ) , p . returncode ) <nl> + if stderr : <nl> + print > > sys . stderr , stderr . rstrip ( ) <nl> + sys . exit ( 2 ) <nl> + <nl> + <nl> + def die ( message ) : <nl> + print > > sys . stderr , ' error : ' , message <nl> + sys . exit ( 2 ) <nl> + <nl> + <nl> + if __name__ = = ' __main__ ' : <nl> + main ( ) <nl> + <nl>
|
Merge pull request from facebook / feature - git - clang - format
|
osquery/osquery
|
7029c72e5a3074f3811bc3f94841e425c371320f
|
2014-11-02T20:36:20Z
|
mmm a / dlib / gui_core / gui_core_kernel_2 . cpp <nl> ppp b / dlib / gui_core / gui_core_kernel_2 . cpp <nl> <nl> # include < X11 / Xutil . h > <nl> # include < X11 / keysym . h > <nl> # include < X11 / Xlocale . h > <nl> + # include < X11 / XKBlib . h > <nl> # include < poll . h > <nl> # include < iostream > <nl> # include " . . / assert . h " <nl> namespace dlib <nl> { <nl> if ( codes [ n ] = = 0 ) <nl> continue ; <nl> - switch ( XKeycodeToKeysym ( disp , codes [ n ] , 0 ) ) <nl> + switch ( XkbKeycodeToKeysym ( disp , codes [ n ] , 0 , 0 ) ) <nl> { <nl> case XK_Alt_L : <nl> alt_mask = index_to_modmask ( n / map - > max_keypermod ) ; <nl>
|
Apparently , XKeycodeToKeysym ( ) is deprecated . Since clang + + was
|
davisking/dlib
|
2e7f65885b2415bae02ba9e004536b22b88920cb
|
2012-05-02T00:51:37Z
|
mmm a / hphp / hack / src / annotated_ast / aast . ml <nl> ppp b / hphp / hack / src / annotated_ast / aast . ml <nl> and tparam = { <nl> tp_variance : Ast . variance ; <nl> tp_name : sid ; <nl> tp_constraints : ( Ast . constraint_kind * hint ) list ; <nl> - tp_reified : Ast . reified ; <nl> + tp_reified : reify_kind ; <nl> tp_user_attributes : user_attribute list <nl> } <nl> <nl> and class_tparams = { <nl> ( * TODO : remove this and use tp_constraints * ) <nl> ( * keeping around the ast version of the constraint only <nl> * for the purposes of Naming . class_meth_bodies * ) <nl> - c_tparam_constraints : ( bool * ( Ast . constraint_kind * hint ) list ) SMap . t [ @ opaque ] <nl> + c_tparam_constraints : ( reify_kind * ( Ast . constraint_kind * hint ) list ) SMap . t [ @ opaque ] <nl> } <nl> <nl> and class_ = { <nl> and ns_kind = <nl> | NSFun <nl> | NSConst <nl> <nl> + and reify_kind = <nl> + | Erased <nl> + | SoftReified <nl> + | Reified <nl> + <nl> let expr_to_string expr = <nl> match expr with <nl> | Any - > " Any " <nl> mmm a / hphp / hack / src / annotated_ast / aast_mapper . ml <nl> ppp b / hphp / hack / src / annotated_ast / aast_mapper . ml <nl> struct <nl> T . tp_variance = t . S . tp_variance ; <nl> T . tp_name = t . S . tp_name ; <nl> T . tp_constraints = t . S . tp_constraints ; <nl> - T . tp_reified = t . S . tp_reified ; <nl> + T . tp_reified = map_reify_kind t . S . tp_reified ; <nl> T . tp_user_attributes = List . map t . S . tp_user_attributes ( map_user_attribute menv ) ; <nl> } <nl> <nl> and map_class_tparams menv ct = <nl> { <nl> T . c_tparam_list = List . map ~ f : ( map_tparam menv ) ct . S . c_tparam_list ; <nl> - T . c_tparam_constraints = ct . S . c_tparam_constraints ; <nl> + T . c_tparam_constraints = SMap . map ( Tuple . T2 . map_fst ~ f : map_reify_kind ) ct . S . c_tparam_constraints ; <nl> } <nl> <nl> and map_func_body menv b = <nl> struct <nl> in <nl> ( kind , id1 , id2 ) <nl> <nl> + and map_reify_kind r = <nl> + match r with <nl> + | S . Erased - > T . Erased <nl> + | S . SoftReified - > T . SoftReified <nl> + | S . Reified - > T . Reified <nl> + <nl> and map_def menv d = <nl> let { map_expr_annotation ; map_env_annotation ; map_funcbody_annotation } = menv in <nl> match d with <nl> mmm a / hphp / hack / src / errors / errors . ml <nl> ppp b / hphp / hack / src / errors / errors . ml <nl> let require_args_reify def_pos arg_pos = <nl> def_pos , " Definition is here " <nl> ] <nl> <nl> - let erased_generic_passed_to_reified ( def_pos , def_name ) ( arg_pos , arg_name ) = <nl> + let erased_generic_passed_to_reified ( def_pos , def_name ) ( arg_pos , arg_name ) reification = <nl> add_list ( Typing . err_code Typing . ErasedGenericPassedToReified ) [ <nl> - arg_pos , arg_name ^ " is not reified , it cannot be used as a reified type argument " ; <nl> + arg_pos , arg_name ^ " is " ^ reification ^ " , it cannot be used as a reified type argument " ; <nl> def_pos , def_name ^ " is reified " <nl> ] <nl> <nl> let nullsafe_not_needed p nonnull_witness = <nl> " You are using the ? - > operator but this object cannot be null . " <nl> ] @ nonnull_witness ) <nl> <nl> - let generic_at_runtime p = <nl> + let generic_at_runtime p prefix = <nl> add ( Typing . err_code Typing . ErasedGenericAtRuntime ) p <nl> - " Erased generics can only be used in type hints since they are erased at runtime . " <nl> + ( prefix ^ " generics can only be used in type hints because \ <nl> + they do not exist at runtime . " ) <nl> <nl> let generics_not_allowed p = <nl> add ( Typing . err_code Typing . GenericsNotAllowed ) p <nl> mmm a / hphp / hack / src / errors / errors . mli <nl> ppp b / hphp / hack / src / errors / errors . mli <nl> val trivial_strict_eq : Pos . t - > string - > ( Pos . t * string ) list <nl> val trivial_strict_not_nullable_compare_null : Pos . t - > string - > ( Pos . t * string ) list - > unit <nl> val void_usage : Pos . t - > ( Pos . t * string ) list - > unit <nl> val noreturn_usage : Pos . t - > ( Pos . t * string ) list - > unit <nl> - val generic_at_runtime : Pos . t - > unit <nl> + val generic_at_runtime : Pos . t - > string - > unit <nl> val generics_not_allowed : Pos . t - > unit <nl> val interface_with_partial_typeconst : Pos . t - > unit <nl> val multiple_xhp_category : Pos . t - > unit <nl> val move_in_nonreactive_context : Pos . t - > unit <nl> val invalid_move_target : Pos . t - > Pos . t - > string - > unit <nl> val invalid_move_use : Pos . t - > unit <nl> val require_args_reify : Pos . t - > Pos . t - > unit <nl> - val erased_generic_passed_to_reified : Pos . t * string - > Pos . t * string - > unit <nl> + val erased_generic_passed_to_reified : Pos . t * string - > Pos . t * string - > string - > unit <nl> val new_static_class_reified : Pos . t - > unit <nl> val new_without_newable : Pos . t - > string - > unit <nl> val ignored_result_of_freeze : Pos . t - > unit <nl> mmm a / hphp / hack / src / naming / ast_to_nast . ml <nl> ppp b / hphp / hack / src / naming / ast_to_nast . ml <nl> let optional f = function <nl> <nl> let both f ( p1 , p2 ) = ( f p1 , f p2 ) <nl> <nl> + let reification reified attributes = <nl> + let soft = List . exists ( fun { Aast . ua_name = ( _ , n ) ; _ } - > n = SN . UserAttributes . uaSoft ) <nl> + attributes in <nl> + if reified <nl> + then if soft <nl> + then Aast . SoftReified <nl> + else Aast . Reified <nl> + else Aast . Erased <nl> + <nl> let rec on_variadic_hint h = <nl> match h with <nl> | Hvariadic h - > Aast . Hvariadic ( optional on_hint h ) <nl> and on_tparam_constraint ( kind , hint ) : ( constraint_kind * Aast . hint ) = <nl> ( kind , on_hint hint ) <nl> <nl> and on_tparam t : Aast . tparam = <nl> + let attributes = on_list on_user_attribute t . tp_user_attributes in <nl> { Aast . tp_variance = t . tp_variance ; <nl> tp_name = t . tp_name ; <nl> tp_constraints = on_list on_tparam_constraint t . tp_constraints ; <nl> - tp_reified = t . tp_reified ; <nl> - tp_user_attributes = on_list on_user_attribute t . tp_user_attributes ; <nl> + tp_reified = reification t . tp_reified attributes ; <nl> + tp_user_attributes = attributes ; <nl> } <nl> <nl> and on_fun_param ? ( trait_or_interface = false ) param : Aast . fun_param = <nl> mmm a / hphp / hack / src / naming / naming . ml <nl> ppp b / hphp / hack / src / naming / naming . ml <nl> module GEnv = NamingGlobal . GEnv <nl> type positioned_ident = ( Pos . t * Local_id . t ) <nl> <nl> ( * < T as A > , A is a type constraint * ) <nl> - type type_constraint = bool * ( Ast . constraint_kind * Ast . hint ) list <nl> - type aast_type_constraint = bool * ( Ast . constraint_kind * Aast . hint ) list <nl> + type type_constraint = N . reify_kind * ( Ast . constraint_kind * Ast . hint ) list <nl> + type aast_type_constraint = N . reify_kind * ( Ast . constraint_kind * Aast . hint ) list <nl> <nl> let convert_type_constraints_to_aast = <nl> Tuple . T2 . map_snd ~ f : ( List . map ~ f : ( Tuple . T2 . map_snd ~ f : Ast_to_nast . on_hint ) ) <nl> end = struct <nl> match SMap . find_opt name genv . type_params with <nl> | Some ( reified , _ ) - > <nl> if not allow_generics then Errors . generics_not_allowed p ; <nl> - if not reified then Errors . generic_at_runtime p ; <nl> + begin match reified with <nl> + | N . Erased - > Errors . generic_at_runtime p " Erased " <nl> + | N . SoftReified - > Errors . generic_at_runtime p " Soft reified " <nl> + | N . Reified - > ( ) end ; <nl> x <nl> | None - > <nl> let ( pos , name ) as x = NS . elaborate_id genv . namespace NS . ElaborateClass x in <nl> module Make ( GetLocals : GetLocals ) = struct <nl> <nl> and aast_type_param ~ forbid_this env t = <nl> let ( genv , _ ) = env in <nl> - if t . Aast . tp_reified & & not ( TypecheckerOptions . experimental_feature_enabled <nl> - genv . tcopt <nl> - TypecheckerOptions . experimental_reified_generics ) <nl> - then <nl> - Errors . experimental_feature ( fst t . Aast . tp_name ) " reified generics " ; <nl> + begin match t . Aast . tp_reified with <nl> + | Aast . Erased - > ( ) <nl> + | Aast . SoftReified <nl> + | Aast . Reified - > <nl> + if not ( TypecheckerOptions . experimental_feature_enabled genv . tcopt <nl> + TypecheckerOptions . experimental_reified_generics ) <nl> + then <nl> + Errors . experimental_feature ( fst t . Aast . tp_name ) " reified generics " end ; <nl> <nl> begin <nl> if ( TypecheckerOptions . experimental_feature_enabled <nl> module Make ( GetLocals : GetLocals ) = struct <nl> <nl> and aast_extend_params genv paraml = <nl> let params = List . fold_right paraml ~ init : genv . type_params <nl> - ~ f : begin fun { Aast . tp_name = ( _ , x ) ; tp_constraints = cstr_list ; tp_reified = r ; _ } acc - > <nl> + ~ f : begin fun { <nl> + Aast . tp_name = ( _ , x ) ; <nl> + tp_constraints = cstr_list ; <nl> + tp_reified = r ; <nl> + _ <nl> + } acc - > <nl> SMap . add x ( r , cstr_list ) acc <nl> end in <nl> { genv with type_params = params } <nl> mmm a / hphp / hack / src / typing / tast_check / reified_check . ml <nl> ppp b / hphp / hack / src / typing / tast_check / reified_check . ml <nl> module UA = Naming_special_names . UserAttributes <nl> module Cls = Typing_classes_heap <nl> <nl> let tparams_has_reified tparams = <nl> - List . exists ~ f : ( fun t - > t . tp_reified ) tparams <nl> + List . exists tparams ~ f : ( fun tparam - > <nl> + match tparam . tp_reified with <nl> + | Nast . Erased - > false <nl> + | Nast . SoftReified <nl> + | Nast . Reified - > true <nl> + ) <nl> <nl> let valid_newable_hint env tp ( pos , hint ) = <nl> match hint with <nl> let verify_has_consistent_bound env ( tparam : Tast . tparam ) = <nl> * where Tf does not exist at runtime . <nl> * ) <nl> let verify_targ_valid_for_reified_tparam env tparam targ = <nl> - begin if tparam . tp_reified then <nl> + ( * There is some subtlety here . If a type * parameter * is declared reified , <nl> + * even if it is soft , we require that the argument be concrete or reified , not soft <nl> + * reified or erased * ) <nl> + begin match tparam . tp_reified with <nl> + | Nast . Reified <nl> + | Nast . SoftReified - > <nl> let ty = Env . hint_to_ty env targ in <nl> - match Typing_generic . IsGeneric . ty ( Tast_env . get_tcopt env ) ty with <nl> - | Some resolved_targ when not ( Tast_env . get_reified env ( snd resolved_targ ) ) - > <nl> - Errors . erased_generic_passed_to_reified tparam . tp_name resolved_targ <nl> - | _ - > ( ) end ; <nl> + begin match Typing_generic . IsGeneric . ty ( Tast_env . get_tcopt env ) ty with <nl> + | Some resolved_targ - > <nl> + begin match ( Tast_env . get_reified env ( snd resolved_targ ) ) with <nl> + | Nast . Erased - > Errors . erased_generic_passed_to_reified tparam . tp_name resolved_targ " not reified " <nl> + | Nast . SoftReified - > Errors . erased_generic_passed_to_reified tparam . tp_name resolved_targ " soft reified " <nl> + | Nast . Reified - > ( ) end <nl> + | _ - > ( ) end <nl> + | Nast . Erased - > ( ) end ; <nl> <nl> begin if Attributes . mem UA . uaEnforceable tparam . tp_user_attributes then <nl> Type_test_hint_check . validate_hint env targ <nl> let handler = object <nl> let t = Tast_env . get_self_id env > > = <nl> Tast_env . get_class env > > | <nl> Cls . tparams > > | <nl> - List . exists ~ f : ( fun tp - > tp . tp_reified ) in <nl> + tparams_has_reified in <nl> Option . iter t ~ f : ( fun has_reified - > if has_reified then <nl> Errors . new_static_class_reified pos <nl> ) <nl> mmm a / hphp / hack / src / typing / tast_check / type_test_hint_check . ml <nl> ppp b / hphp / hack / src / typing / tast_check / type_test_hint_check . ml <nl> let visitor = object ( this ) <nl> List . fold_left bounds ~ f : this # on_type ~ init : acc <nl> | AKgeneric name - > <nl> begin match Env . get_reified acc . env name , Env . get_enforceable acc . env name with <nl> - | false , _ - > update acc @ @ <nl> + | Nast . Erased , _ - > update acc @ @ <nl> Invalid ( r , " an erased generic type parameter " ) <nl> - | true , false - > update acc @ @ <nl> + | Nast . SoftReified , _ - > update acc @ @ <nl> + Invalid ( r , " a soft reified generic type parameter " ) <nl> + | Nast . Reified , false - > update acc @ @ <nl> Invalid ( r , " a reified type parameter that is not marked < < __Enforceable > > " ) <nl> - | true , true - > <nl> + | Nast . Reified , true - > <nl> acc end <nl> | AKnewtype _ - > update acc @ @ Invalid ( r , " a newtype " ) <nl> | AKdependent _ - > update acc @ @ Invalid ( r , " an expression dependent type " ) <nl> let visitor = object ( this ) <nl> if this # is_wildcard targ <nl> then acc <nl> else <nl> - if tparam . tp_reified <nl> - then this # on_type acc targ <nl> - else update acc @ @ Invalid ( r , " a type with an erased generic type argument " ) <nl> + match tparam . tp_reified with <nl> + | Nast . Erased - > update acc @ @ Invalid ( r , " a type with an erased generic type argument " ) <nl> + | Nast . SoftReified - > update acc @ @ Invalid ( r , " a type with a soft reified type argument " ) <nl> + | Nast . Reified - > this # on_type acc targ <nl> ) with <nl> | Ok new_acc - > new_acc <nl> | Unequal_lengths - > acc ( * arity error elsewhere * ) <nl> mmm a / hphp / hack / src / typing / tast_env . mli <nl> ppp b / hphp / hack / src / typing / tast_env . mli <nl> val localize_with_dty_validator : <nl> val get_upper_bounds : env - > string - > Type_parameter_env . tparam_bounds <nl> ( * * Get the upper bounds of the type parameter with the given name . * ) <nl> <nl> - val get_reified : env - > string - > bool <nl> + val get_reified : env - > string - > Nast . reify_kind <nl> ( * * Get the reification of the type parameter with the given name . * ) <nl> <nl> val get_enforceable : env - > string - > bool <nl> mmm a / hphp / hack / src / typing / type_parameter_env . ml <nl> ppp b / hphp / hack / src / typing / type_parameter_env . ml <nl> type tparam_bounds = TySet . t <nl> type tparam_info = { <nl> lower_bounds : tparam_bounds ; <nl> upper_bounds : tparam_bounds ; <nl> - reified : bool ; <nl> + reified : Nast . reify_kind ; <nl> enforceable : bool ; <nl> newable : bool ; <nl> } <nl> let pp_tparam_info fmt tpi = <nl> Format . fprintf fmt " ; @ " ; <nl> <nl> Format . fprintf fmt " @ [ % s = @ " " reified " ; <nl> - Format . pp_print_bool fmt tpi . reified ; <nl> + Nast . pp_reify_kind fmt tpi . reified ; <nl> Format . fprintf fmt " @ ] " ; <nl> Format . fprintf fmt " ; @ " ; <nl> <nl> mmm a / hphp / hack / src / typing / typing . ml <nl> ppp b / hphp / hack / src / typing / typing . ml <nl> and get_instance_var env = function <nl> and is_array env ty p pred_name arg_expr = <nl> refine_lvalue_type env arg_expr ~ refine : begin fun env arg_ty - > <nl> let r = Reason . Rpredicated ( p , pred_name ) in <nl> - let env , tarrkey_name = Env . add_fresh_generic_parameter env " Tk " ~ reified : false ~ enforceable : false ~ newable : false in <nl> + let env , tarrkey_name = Env . add_fresh_generic_parameter env " Tk " ~ reified : Nast . Erased ~ enforceable : false ~ newable : false in <nl> let tarrkey = ( r , Tabstract ( AKgeneric tarrkey_name , None ) ) in <nl> let env = SubType . add_constraint p env Ast . Constraint_as tarrkey ( MakeType . arraykey r ) in <nl> - let env , tfresh_name = Env . add_fresh_generic_parameter env " T " ~ reified : false ~ enforceable : false ~ newable : false in <nl> + let env , tfresh_name = Env . add_fresh_generic_parameter env " T " ~ reified : Nast . Erased ~ enforceable : false ~ newable : false in <nl> let tfresh = ( r , Tabstract ( AKgeneric tfresh_name , None ) ) in <nl> ( * This is the refined type of e inside the branch * ) <nl> let refined_ty = <nl> and user_attribute env ua = <nl> T . ua_params = typed_ua_params ; <nl> } <nl> <nl> + and reify_kind = function <nl> + | Nast . Erased - > T . Erased <nl> + | Nast . SoftReified - > T . SoftReified <nl> + | Nast . Reified - > T . Reified <nl> + <nl> + <nl> and type_param env t = <nl> let env = Typing_attributes . check_def env new_object <nl> SN . AttributeKinds . typeparam t . tp_user_attributes in <nl> and type_param env t = <nl> T . tp_variance = t . tp_variance ; <nl> T . tp_name = t . tp_name ; <nl> T . tp_constraints = t . tp_constraints ; <nl> - T . tp_reified = t . tp_reified ; <nl> + T . tp_reified = reify_kind t . tp_reified ; <nl> T . tp_user_attributes = List . map t . tp_user_attributes ( user_attribute env ) ; <nl> } <nl> <nl> and class_type_param env ct = <nl> { <nl> T . c_tparam_list = List . map ~ f : ( type_param env ) ct . c_tparam_list ; <nl> - T . c_tparam_constraints = ct . c_tparam_constraints ; <nl> + T . c_tparam_constraints = SMap . map ( Tuple . T2 . map_fst ~ f : reify_kind ) ct . c_tparam_constraints ; <nl> } <nl> <nl> and method_def env m = <nl> mmm a / hphp / hack / src / typing / typing_defs . ml <nl> ppp b / hphp / hack / src / typing / typing_defs . ml <nl> and ' phase tparam = { <nl> tp_variance : Ast . variance ; <nl> tp_name : Ast . id ; <nl> tp_constraints : ( Ast . constraint_kind * ' phase ty ) list ; <nl> - tp_reified : Ast . reified ; <nl> + tp_reified : Nast . reify_kind ; <nl> tp_user_attributes : Nast . user_attribute list ; <nl> } <nl> <nl> mmm a / hphp / hack / src / typing / typing_env . ml <nl> ppp b / hphp / hack / src / typing / typing_env . ml <nl> match SMap . get name tpenv with <nl> | None - > empty_bounds <nl> | Some { upper_bounds ; _ } - > upper_bounds <nl> <nl> + <nl> let get_tpenv_reified tpenv name = <nl> match SMap . get name tpenv with <nl> - | None - > false <nl> + | None - > Erased <nl> | Some { reified ; _ } - > reified <nl> <nl> let get_tpenv_enforceable tpenv name = <nl> let get_upper_bounds env name = <nl> let get_reified env name = <nl> let local = get_tpenv_reified env . lenv . tpenv name in <nl> let global = get_tpenv_reified env . global_tpenv name in <nl> - local | | global <nl> + match local , global with <nl> + | Reified , _ | _ , Reified - > Reified <nl> + | SoftReified , _ | _ , SoftReified - > SoftReified <nl> + | _ - > Erased <nl> <nl> let get_enforceable env name = <nl> let local = get_tpenv_enforceable env . lenv . tpenv name in <nl> let add_upper_bound_ tpenv name ty = <nl> SMap . add name <nl> { lower_bounds = empty_bounds ; <nl> upper_bounds = singleton_bound ty ; <nl> - reified = false ; <nl> + reified = Erased ; <nl> enforceable = false ; <nl> newable = false } tpenv <nl> | Some tp - > <nl> let add_lower_bound_ tpenv name ty = <nl> SMap . add name <nl> { lower_bounds = singleton_bound ty ; <nl> upper_bounds = empty_bounds ; <nl> - reified = false ; <nl> + reified = Erased ; <nl> enforceable = false ; <nl> newable = false } tpenv <nl> | Some tp - > <nl> mmm a / hphp / hack / src / typing / typing_env . mli <nl> ppp b / hphp / hack / src / typing / typing_env . mli <nl> val set_local_expr_id : env - > Local_id . t - > expression_id - > env <nl> val get_local_expr_id : env - > Local_id . t - > expression_id option <nl> val get_tpenv_lower_bounds : tpenv - > string - > tparam_bounds <nl> val get_tpenv_upper_bounds : tpenv - > string - > tparam_bounds <nl> - val get_tpenv_reified : tpenv - > string - > bool <nl> + val get_tpenv_reified : tpenv - > string - > Nast . reify_kind <nl> val get_tpenv_enforceable : tpenv - > string - > bool <nl> val get_tpenv_newable : tpenv - > string - > bool <nl> val get_lower_bounds : env - > string - > tparam_bounds <nl> val get_upper_bounds : env - > string - > tparam_bounds <nl> - val get_reified : env - > string - > bool <nl> + val get_reified : env - > string - > Nast . reify_kind <nl> val get_enforceable : env - > string - > bool <nl> val get_newable : env - > string - > bool <nl> val add_upper_bound : <nl> val remove_equivalent_tyvars : <nl> env - > Ident . t - > env <nl> val error_if_reactive_context : env - > ( unit - > unit ) - > unit <nl> val error_if_shallow_reactive_context : env - > ( unit - > unit ) - > unit <nl> - val add_fresh_generic_parameter : env - > string - > reified : bool - > enforceable : bool - > newable : bool - > env * string <nl> + val add_fresh_generic_parameter : env - > string - > reified : Nast . reify_kind - > enforceable : bool - > newable : bool - > env * string <nl> val is_fresh_generic_parameter : string - > bool <nl> val get_tpenv_size : env - > int <nl> val get_tpenv_tparams : env - > SSet . t <nl> mmm a / hphp / hack / src / typing / typing_print . ml <nl> ppp b / hphp / hack / src / typing / typing_print . ml <nl> module Full = struct <nl> and tparam : type a . _ - > _ - > _ - > a Typing_defs . tparam - > _ = <nl> fun to_doc st env { tp_name = ( _ , x ) ; tp_constraints = cstrl ; tp_reified = r ; _ } - > <nl> Concat [ <nl> - if r then text " reify " ^ ^ Space else Nothing ; <nl> + begin match r with <nl> + | Nast . Erased - > Nothing <nl> + | Nast . SoftReified - > text " < < __Soft > > reify " ^ ^ Space <nl> + | Nast . Reified - > text " reify " ^ ^ Space end ; <nl> text x ; <nl> list_sep ~ split : false Space ( tparam_constraint to_doc st env ) cstrl ; <nl> ] <nl> module PrintClass = struct <nl> ( List . fold_right <nl> cstrl <nl> ~ f : ( fun x acc - > constraint_ty tcopt x ^ " " ^ acc ) <nl> - ~ init : " " ) <nl> - ^ ( if reified then " reified " else " " ) <nl> + ~ init : " " ) ^ <nl> + match reified with <nl> + | Nast . Erased - > " " <nl> + | Nast . SoftReified - > " soft reified " <nl> + | Nast . Reified - > " reified " <nl> <nl> let tparam_list tcopt l = <nl> List . fold_right l ~ f : ( fun x acc - > tparam tcopt x ^ " , " ^ acc ) ~ init : " " <nl> mmm a / hphp / hack / test / tast / add_vector . php . exp <nl> ppp b / hphp / hack / test / tast / add_vector . php . exp <nl> <nl> c_tparams = <nl> { c_tparam_list = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 12 : 21 - 22 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] <nl> + } <nl> ] ; <nl> c_tparam_constraints = < opaque > } ; <nl> c_extends = [ ] ; c_uses = [ ] ; c_method_redeclarations = [ ] ; <nl> mmm a / hphp / hack / test / tast / re_prefixed_string / re_prefixed_string . php . exp <nl> ppp b / hphp / hack / test / tast / re_prefixed_string / re_prefixed_string . php . exp <nl> Errors : <nl> ( [ 19 : 23 - 41 ] , <nl> ( Happly ( ( [ 19 : 23 - 41 ] , " \ \ HH \ \ Lib \ \ Regex \ \ Match " ) , [ ] ) ) ) ) <nl> ] ; <nl> - tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_reified = Erased ; tp_user_attributes = [ ] } <nl> ] ; <nl> f_where_constraints = [ ] ; f_variadic = FVnonVariadic ; <nl> f_params = <nl> mmm a / hphp / hack / test / tast / reified_generic_attributes . php <nl> ppp b / hphp / hack / test / tast / reified_generic_attributes . php <nl> class B implements HH \ TypeParameterAttribute { } <nl> function f < < < __Newable , __Enforceable , A > > reify T , > ( ) { } <nl> function g < T , < < Enforceable , __Newable > > reify Tu > ( ) { } <nl> function h < < < B > > T > ( ) { } <nl> + function j < < < __Soft > > reify Tv > ( ) { } <nl> <nl> function ff < < < A ( 1 ) > > T > ( ) { } <nl> mmm a / hphp / hack / test / tast / reified_generic_attributes . php . exp <nl> ppp b / hphp / hack / test / tast / reified_generic_attributes . php . exp <nl> <nl> Errors : <nl> [ 7 : 17 - 28 ] Unbound name : Enforceable ( an object type ) <nl> [ 7 : 17 - 28 ] Unrecognized user attribute : Enforceable does not have a class . Please declare a class for the attribute . <nl> - [ 10 : 15 - 16 ] This constructor expects no argument <nl> + [ 11 : 15 - 16 ] This constructor expects no argument <nl> [ 6 : 48 - 49 ] The type parameter T has the < < __Newable > > attribute . Newable type parameters must be constrained with ` as ` , and exactly one of those constraints must be a valid newable class . The class must either be final or have a constructor that is consistent . This can be accomplished by making the constructor final or having < < __ConsistentConstruct > > . No constraints are valid newable classes <nl> [ 7 : 47 - 49 ] The type parameter Tu has the < < __Newable > > attribute . Newable type parameters must be constrained with ` as ` , and exactly one of those constraints must be a valid newable class . The class must either be final or have a constructor that is consistent . This can be accomplished by making the constructor final or having < < __ConsistentConstruct > > . No constraints are valid newable classes <nl> [ ( Class <nl> Errors : <nl> f_name = ( [ 6 : 10 - 11 ] , " \ \ f " ) ; <nl> f_tparams = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 6 : 48 - 49 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = true ; <nl> + tp_constraints = [ ] ; tp_reified = Reified ; <nl> tp_user_attributes = <nl> [ { ua_name = ( [ 6 : 38 - 39 ] , " \ \ A " ) ; ua_params = [ ] } ; <nl> { ua_name = ( [ 6 : 24 - 37 ] , " __Enforceable " ) ; ua_params = [ ] } ; <nl> Errors : <nl> f_name = ( [ 7 : 10 - 11 ] , " \ \ g " ) ; <nl> f_tparams = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 7 : 12 - 13 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } ; <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] } ; <nl> { tp_variance = Invariant ; tp_name = ( [ 7 : 47 - 49 ] , " Tu " ) ; <nl> - tp_constraints = [ ] ; tp_reified = true ; <nl> + tp_constraints = [ ] ; tp_reified = Reified ; <nl> tp_user_attributes = <nl> [ { ua_name = ( [ 7 : 29 - 38 ] , " __Newable " ) ; ua_params = [ ] } ; <nl> { ua_name = ( [ 7 : 17 - 28 ] , " \ \ Enforceable " ) ; ua_params = [ ] } ] <nl> Errors : <nl> f_name = ( [ 8 : 10 - 11 ] , " \ \ h " ) ; <nl> f_tparams = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 8 : 17 - 18 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; <nl> + tp_constraints = [ ] ; tp_reified = Erased ; <nl> tp_user_attributes = <nl> [ { ua_name = ( [ 8 : 14 - 15 ] , " \ \ B " ) ; ua_params = [ ] } ] } <nl> ] ; <nl> Errors : <nl> f_external = false ; f_namespace = < opaque > ; f_doc_comment = None ; <nl> f_static = false } ) ; <nl> ( Fun <nl> - { f_span = [ 10 : 1 - 29 ] ; f_annotation = ( ) ; f_mode = < opaque > ; <nl> - f_ret = None ; f_name = ( [ 10 : 10 - 12 ] , " \ \ ff " ) ; <nl> + { f_span = [ 9 : 1 - 37 ] ; f_annotation = ( ) ; f_mode = < opaque > ; f_ret = None ; <nl> + f_name = ( [ 9 : 10 - 11 ] , " \ \ j " ) ; <nl> f_tparams = <nl> - [ { tp_variance = Invariant ; tp_name = ( [ 10 : 22 - 23 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; <nl> + [ { tp_variance = Invariant ; tp_name = ( [ 9 : 29 - 31 ] , " Tv " ) ; <nl> + tp_constraints = [ ] ; tp_reified = SoftReified ; <nl> tp_user_attributes = <nl> - [ { ua_name = ( [ 10 : 15 - 16 ] , " \ \ A " ) ; <nl> - ua_params = [ ( ( [ 10 : 17 - 18 ] , int ) , ( Int " 1 " ) ) ] } <nl> + [ { ua_name = ( [ 9 : 14 - 20 ] , " __Soft " ) ; ua_params = [ ] } ] } <nl> + ] ; <nl> + f_where_constraints = [ ] ; f_variadic = FVnonVariadic ; f_params = [ ] ; <nl> + f_body = <nl> + { fb_ast = [ ( [ Pos . none ] , Noop ) ] ; fb_annotation = No unsafe blocks } ; <nl> + f_fun_kind = FSync ; f_user_attributes = [ ] ; f_file_attributes = [ ] ; <nl> + f_external = false ; f_namespace = < opaque > ; f_doc_comment = None ; <nl> + f_static = false } ) ; <nl> + ( Fun <nl> + { f_span = [ 11 : 1 - 29 ] ; f_annotation = ( ) ; f_mode = < opaque > ; <nl> + f_ret = None ; f_name = ( [ 11 : 10 - 12 ] , " \ \ ff " ) ; <nl> + f_tparams = <nl> + [ { tp_variance = Invariant ; tp_name = ( [ 11 : 22 - 23 ] , " T " ) ; <nl> + tp_constraints = [ ] ; tp_reified = Erased ; <nl> + tp_user_attributes = <nl> + [ { ua_name = ( [ 11 : 15 - 16 ] , " \ \ A " ) ; <nl> + ua_params = [ ( ( [ 11 : 17 - 18 ] , int ) , ( Int " 1 " ) ) ] } <nl> ] <nl> } <nl> ] ; <nl> mmm a / hphp / hack / test / tast / reified_generic_shadowing . php . exp <nl> ppp b / hphp / hack / test / tast / reified_generic_shadowing . php . exp <nl> <nl> Errors : <nl> [ 6 : 12 - 16 ] Name already bound : Tcat <nl> [ 4 : 7 - 11 ] Previous definition is here <nl> - [ 7 : 7 - 11 ] Erased generics can only be used in type hints since they are erased at runtime . <nl> + [ 7 : 7 - 11 ] Erased generics can only be used in type hints because they do not exist at runtime . <nl> [ 7 : 3 - 13 ] Tcat cannot be used with ` new ` because it does not have the < < __Newable > > attribute <nl> [ ( Class <nl> { c_span = [ 4 : 1 - 14 ] ; c_annotation = ( ) ; c_mode = < opaque > ; <nl> Errors : <nl> f_name = ( [ 6 : 10 - 11 ] , " \ \ f " ) ; <nl> f_tparams = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 6 : 12 - 16 ] , " Tcat " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] } <nl> ] ; <nl> f_where_constraints = [ ] ; f_variadic = FVnonVariadic ; f_params = [ ] ; <nl> f_body = <nl> mmm a / hphp / hack / test / tast / reified_generic_shadowing2 . php . exp <nl> ppp b / hphp / hack / test / tast / reified_generic_shadowing2 . php . exp <nl> Errors : <nl> c_tparams = <nl> { c_tparam_list = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 4 : 10 - 12 ] , " Tc " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] <nl> + } <nl> ] ; <nl> c_tparam_constraints = < opaque > } ; <nl> c_extends = [ ] ; c_uses = [ ] ; c_method_redeclarations = [ ] ; <nl> mmm a / hphp / hack / test / tast / reified_generic_shadowing3 . php . exp <nl> ppp b / hphp / hack / test / tast / reified_generic_shadowing3 . php . exp <nl> <nl> Errors : <nl> - [ 5 : 7 - 8 ] Erased generics can only be used in type hints since they are erased at runtime . <nl> + [ 5 : 7 - 8 ] Erased generics can only be used in type hints because they do not exist at runtime . <nl> [ 6 : 7 - 8 ] Unbound name : U ( an object type ) <nl> [ 5 : 3 - 10 ] T cannot be used with ` new ` because it does not have the < < __Newable > > attribute <nl> [ ( Fun <nl> Errors : <nl> f_ret = ( Some ( [ 4 : 18 - 22 ] , ( Hprim Tvoid ) ) ) ; f_name = ( [ 4 : 10 - 11 ] , " \ \ f " ) ; <nl> f_tparams = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 4 : 12 - 13 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] } <nl> ] ; <nl> f_where_constraints = [ ] ; f_variadic = FVnonVariadic ; f_params = [ ] ; <nl> f_body = <nl> mmm a / hphp / hack / test / tast / reify_mix_with_erased . php . exp <nl> ppp b / hphp / hack / test / tast / reify_mix_with_erased . php . exp <nl> Errors : <nl> f_ret = ( Some ( [ 3 : 33 - 35 ] , ( Habstr " Tu " ) ) ) ; f_name = ( [ 3 : 10 - 11 ] , " \ \ f " ) ; <nl> f_tparams = <nl> [ { tp_variance = Invariant ; tp_name = ( [ 3 : 18 - 19 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = true ; tp_user_attributes = [ ] } ; <nl> + tp_constraints = [ ] ; tp_reified = Reified ; tp_user_attributes = [ ] } ; <nl> { tp_variance = Invariant ; tp_name = ( [ 3 : 21 - 23 ] , " Tu " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] } <nl> ] ; <nl> f_where_constraints = [ ] ; f_variadic = FVnonVariadic ; <nl> f_params = <nl> mmm a / hphp / hack / test / tast / typedef . php . exp <nl> ppp b / hphp / hack / test / tast / typedef . php . exp <nl> <nl> { t_annotation = ( ) ; t_name = ( [ 13 : 6 - 23 ] , " \ \ Serialized_contra " ) ; <nl> t_tparams = <nl> [ { tp_variance = Contravariant ; tp_name = ( [ 13 : 25 - 26 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] } <nl> ] ; <nl> t_constraint = None ; t_kind = ( [ 13 : 30 - 36 ] , ( Hprim Tstring ) ) ; <nl> t_user_attributes = [ ] ; t_mode = < opaque > ; t_vis = Transparent ; <nl> <nl> { t_annotation = ( ) ; t_name = ( [ 14 : 6 - 19 ] , " \ \ Serialized_co " ) ; <nl> t_tparams = <nl> [ { tp_variance = Covariant ; tp_name = ( [ 14 : 21 - 22 ] , " T " ) ; <nl> - tp_constraints = [ ] ; tp_reified = false ; tp_user_attributes = [ ] } <nl> + tp_constraints = [ ] ; tp_reified = Erased ; tp_user_attributes = [ ] } <nl> ] ; <nl> t_constraint = None ; t_kind = ( [ 14 : 26 - 32 ] , ( Hprim Tstring ) ) ; <nl> t_user_attributes = [ ] ; t_mode = < opaque > ; t_vis = Transparent ; <nl> mmm a / hphp / hack / test / typecheck / reified_generics / class_soft_reification . php <nl> ppp b / hphp / hack / test / typecheck / reified_generics / class_soft_reification . php <nl> <nl> / / Copyright 2004 - present Facebook . All Rights Reserved . <nl> <nl> class Erased < T > { } <nl> + class SoftReified < < < __Soft > > reify T > { } <nl> class Reified < reify T > { } <nl> <nl> function new_keywordCheck ( ) : void { <nl> new Erased ( ) ; <nl> new Erased < int > ( ) ; <nl> <nl> + new SoftReified ( ) ; / / bad <nl> + new SoftReified < int > ( ) ; <nl> + <nl> new Reified ( ) ; / / bad <nl> new Reified < int > ( ) ; <nl> } <nl> + <nl> + function reification_test < <nl> + Terase , <nl> + < < __Soft > > reify Tsoft , <nl> + reify Thard <nl> + > ( ) : void { <nl> + new Erased < Terase > ( ) ; <nl> + new Erased < Tsoft > ( ) ; <nl> + new Erased < Thard > ( ) ; <nl> + <nl> + new SoftReified < Terase > ( ) ; <nl> + new SoftReified < Tsoft > ( ) ; <nl> + new SoftReified < Thard > ( ) ; <nl> + <nl> + new Reified < Terase > ( ) ; <nl> + new Reified < Tsoft > ( ) ; <nl> + new Reified < Thard > ( ) ; <nl> + } <nl> mmm a / hphp / hack / test / typecheck / reified_generics / class_soft_reification . php . exp <nl> ppp b / hphp / hack / test / typecheck / reified_generics / class_soft_reification . php . exp <nl> <nl> - File " class_soft_reification . php " , line 11 , characters 3 - 15 : <nl> + File " class_soft_reification . php " , line 12 , characters 3 - 19 : <nl> All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> - File " class_soft_reification . php " , line 5 , characters 7 - 13 : <nl> + File " class_soft_reification . php " , line 5 , characters 7 - 17 : <nl> Definition is here <nl> + File " class_soft_reification . php " , line 15 , characters 3 - 15 : <nl> + All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> + File " class_soft_reification . php " , line 6 , characters 7 - 13 : <nl> + Definition is here <nl> + File " class_soft_reification . php " , line 28 , characters 19 - 24 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " class_soft_reification . php " , line 5 , characters 36 - 36 : <nl> + T is reified <nl> + File " class_soft_reification . php " , line 29 , characters 19 - 23 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " class_soft_reification . php " , line 5 , characters 36 - 36 : <nl> + T is reified <nl> + File " class_soft_reification . php " , line 32 , characters 15 - 20 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " class_soft_reification . php " , line 6 , characters 21 - 21 : <nl> + T is reified <nl> + File " class_soft_reification . php " , line 33 , characters 15 - 19 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " class_soft_reification . php " , line 6 , characters 21 - 21 : <nl> + T is reified <nl> mmm a / hphp / hack / test / typecheck / reified_generics / deep_soft_reification . php <nl> ppp b / hphp / hack / test / typecheck / reified_generics / deep_soft_reification . php <nl> <nl> / / Copyright 2004 - present Facebook . All Rights Reserved . <nl> <nl> class Erased < T > { } <nl> + class SoftReified < < < __Soft > > reify T > { } <nl> class Reified < reify T > { } <nl> <nl> function new_targCheck ( ) : void { <nl> new Erased < Erased > ( ) ; <nl> new Erased < Erased < int > > ( ) ; <nl> <nl> + new Erased < SoftReified > ( ) ; / / bad <nl> + new Erased < SoftReified < int > > ( ) ; <nl> + <nl> new Erased < Reified > ( ) ; / / bad <nl> new Erased < Reified < int > > ( ) ; <nl> } <nl> + <nl> + function reification_test < <nl> + Terase , <nl> + < < __Soft > > reify Tsoft , <nl> + reify Thard <nl> + > ( ) : void { <nl> + new Erased < Erased < Terase > > ( ) ; <nl> + new Erased < Erased < Tsoft > > ( ) ; <nl> + new Erased < Erased < Thard > > ( ) ; <nl> + <nl> + new Erased < SoftReified < Terase > > ( ) ; <nl> + new Erased < SoftReified < Tsoft > > ( ) ; <nl> + new Erased < SoftReified < Thard > > ( ) ; <nl> + <nl> + new Erased < Reified < Terase > > ( ) ; <nl> + new Erased < Reified < Tsoft > > ( ) ; <nl> + new Erased < Reified < Thard > > ( ) ; <nl> + } <nl> mmm a / hphp / hack / test / typecheck / reified_generics / deep_soft_reification . php . exp <nl> ppp b / hphp / hack / test / typecheck / reified_generics / deep_soft_reification . php . exp <nl> <nl> - File " deep_soft_reification . php " , line 11 , characters 14 - 20 : <nl> + File " deep_soft_reification . php " , line 12 , characters 14 - 24 : <nl> All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> - File " deep_soft_reification . php " , line 5 , characters 7 - 13 : <nl> + File " deep_soft_reification . php " , line 5 , characters 7 - 17 : <nl> Definition is here <nl> + File " deep_soft_reification . php " , line 15 , characters 14 - 20 : <nl> + All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> + File " deep_soft_reification . php " , line 6 , characters 7 - 13 : <nl> + Definition is here <nl> + File " deep_soft_reification . php " , line 28 , characters 26 - 31 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " deep_soft_reification . php " , line 5 , characters 36 - 36 : <nl> + T is reified <nl> + File " deep_soft_reification . php " , line 29 , characters 26 - 30 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " deep_soft_reification . php " , line 5 , characters 36 - 36 : <nl> + T is reified <nl> + File " deep_soft_reification . php " , line 32 , characters 22 - 27 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " deep_soft_reification . php " , line 6 , characters 21 - 21 : <nl> + T is reified <nl> + File " deep_soft_reification . php " , line 33 , characters 22 - 26 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " deep_soft_reification . php " , line 6 , characters 21 - 21 : <nl> + T is reified <nl> mmm a / hphp / hack / test / typecheck / reified_generics / function_soft_reification . php <nl> ppp b / hphp / hack / test / typecheck / reified_generics / function_soft_reification . php <nl> <nl> / / Copyright 2004 - present Facebook . All Rights Reserved . <nl> <nl> function erased < T > ( ) : void { } <nl> + function softReified < < < __Soft > > reify T > ( ) : void { } <nl> function reified < reify T > ( ) : void { } <nl> <nl> function call_keywordCheck ( ) : void { <nl> erased ( ) ; <nl> erased < int > ( ) ; <nl> <nl> + softReified ( ) ; / / bad <nl> + softReified < int > ( ) ; <nl> + <nl> reified ( ) ; / / bad <nl> reified < int > ( ) ; <nl> } <nl> + <nl> + function reification_test < <nl> + Terase , <nl> + < < __Soft > > reify Tsoft , <nl> + reify Thard <nl> + > ( ) : void { <nl> + erased < Terase > ( ) ; <nl> + erased < Tsoft > ( ) ; <nl> + erased < Thard > ( ) ; <nl> + <nl> + softReified < Terase > ( ) ; <nl> + softReified < Tsoft > ( ) ; <nl> + softReified < Thard > ( ) ; <nl> + <nl> + reified < Terase > ( ) ; <nl> + reified < Tsoft > ( ) ; <nl> + reified < Thard > ( ) ; <nl> + } <nl> mmm a / hphp / hack / test / typecheck / reified_generics / function_soft_reification . php . exp <nl> ppp b / hphp / hack / test / typecheck / reified_generics / function_soft_reification . php . exp <nl> <nl> - File " function_soft_reification . php " , line 11 , characters 3 - 11 : <nl> + File " function_soft_reification . php " , line 12 , characters 3 - 15 : <nl> All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> - File " function_soft_reification . php " , line 5 , characters 10 - 16 : <nl> + File " function_soft_reification . php " , line 5 , characters 10 - 20 : <nl> Definition is here <nl> + File " function_soft_reification . php " , line 15 , characters 3 - 11 : <nl> + All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> + File " function_soft_reification . php " , line 6 , characters 10 - 16 : <nl> + Definition is here <nl> + File " function_soft_reification . php " , line 28 , characters 15 - 20 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " function_soft_reification . php " , line 5 , characters 39 - 39 : <nl> + T is reified <nl> + File " function_soft_reification . php " , line 29 , characters 15 - 19 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " function_soft_reification . php " , line 5 , characters 39 - 39 : <nl> + T is reified <nl> + File " function_soft_reification . php " , line 32 , characters 11 - 16 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " function_soft_reification . php " , line 6 , characters 24 - 24 : <nl> + T is reified <nl> + File " function_soft_reification . php " , line 33 , characters 11 - 15 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " function_soft_reification . php " , line 6 , characters 24 - 24 : <nl> + T is reified <nl> new file mode 100644 <nl> index 00000000000 . . 7e55a875ca6 <nl> mmm / dev / null <nl> ppp b / hphp / hack / test / typecheck / reified_generics / is_as_soft_reified . php <nl> <nl> + < ? hh / / strict <nl> + / / Copyright 2004 - present Facebook . All Rights Reserved . <nl> + <nl> + class C < < < __Soft > > reify T > { } <nl> + <nl> + function f ( ) : void { <nl> + 3 as C < _ > ; <nl> + 3 as C < int > ; <nl> + } <nl> new file mode 100644 <nl> index 00000000000 . . 4379fd8dec4 <nl> mmm / dev / null <nl> ppp b / hphp / hack / test / typecheck / reified_generics / is_as_soft_reified . php . exp <nl> <nl> + File " is_as_soft_reified . php " , line 8 , characters 8 - 13 : <nl> + Invalid " as " expression hint ( Typing [ 4195 ] ) <nl> + File " is_as_soft_reified . php " , line 8 , characters 8 - 13 : <nl> + The " as " operator cannot be used with a type with a soft reified type argument <nl> mmm a / hphp / hack / test / typecheck / reified_generics / method_soft_reification . php <nl> ppp b / hphp / hack / test / typecheck / reified_generics / method_soft_reification . php <nl> <nl> <nl> class C { <nl> public function erased < T > ( ) : void { } <nl> + public function softReified < < < __Soft > > reify T > ( ) : void { } <nl> public function reified < reify T > ( ) : void { } <nl> } <nl> <nl> function call_keywordCheck ( ) : void { <nl> <nl> $ c - > erased ( ) ; <nl> $ c - > erased < int > ( ) ; <nl> - $ c - > erased < int > ( ) ; <nl> + <nl> + $ c - > softReified ( ) ; / / bad <nl> + $ c - > softReified < int > ( ) ; <nl> <nl> $ c - > reified ( ) ; / / bad <nl> $ c - > reified < int > ( ) ; <nl> - $ c - > reified < int > ( ) ; <nl> + } <nl> + <nl> + function reification_test < <nl> + Terase , <nl> + < < __Soft > > reify Tsoft , <nl> + reify Thard <nl> + > ( ) : void { <nl> + $ c = new C ( ) ; <nl> + <nl> + $ c - > erased < Terase > ( ) ; <nl> + $ c - > erased < Tsoft > ( ) ; <nl> + $ c - > erased < Thard > ( ) ; <nl> + <nl> + $ c - > softReified < Terase > ( ) ; <nl> + $ c - > softReified < Tsoft > ( ) ; <nl> + $ c - > softReified < Thard > ( ) ; <nl> + <nl> + $ c - > reified < Terase > ( ) ; <nl> + $ c - > reified < Tsoft > ( ) ; <nl> + $ c - > reified < Thard > ( ) ; <nl> } <nl> mmm a / hphp / hack / test / typecheck / reified_generics / method_soft_reification . php . exp <nl> ppp b / hphp / hack / test / typecheck / reified_generics / method_soft_reification . php . exp <nl> <nl> - File " method_soft_reification . php " , line 16 , characters 3 - 15 : <nl> + File " method_soft_reification . php " , line 16 , characters 3 - 19 : <nl> All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> - File " method_soft_reification . php " , line 6 , characters 19 - 25 : <nl> + File " method_soft_reification . php " , line 6 , characters 19 - 29 : <nl> Definition is here <nl> + File " method_soft_reification . php " , line 19 , characters 3 - 15 : <nl> + All type arguments must be specified because a type parameter is reified ( Typing [ 4303 ] ) <nl> + File " method_soft_reification . php " , line 7 , characters 19 - 25 : <nl> + Definition is here <nl> + File " method_soft_reification . php " , line 34 , characters 19 - 24 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " method_soft_reification . php " , line 6 , characters 48 - 48 : <nl> + T is reified <nl> + File " method_soft_reification . php " , line 35 , characters 19 - 23 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " method_soft_reification . php " , line 6 , characters 48 - 48 : <nl> + T is reified <nl> + File " method_soft_reification . php " , line 38 , characters 15 - 20 : <nl> + Terase is not reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " method_soft_reification . php " , line 7 , characters 33 - 33 : <nl> + T is reified <nl> + File " method_soft_reification . php " , line 39 , characters 15 - 19 : <nl> + Tsoft is soft reified , it cannot be used as a reified type argument ( Typing [ 4305 ] ) <nl> + File " method_soft_reification . php " , line 7 , characters 33 - 33 : <nl> + T is reified <nl> mmm a / hphp / hack / test / typecheck / reified_generics / reference_generic . php . exp <nl> ppp b / hphp / hack / test / typecheck / reified_generics / reference_generic . php . exp <nl> <nl> File " reference_generic . php " , line 5 , characters 7 - 7 : <nl> - Erased generics can only be used in type hints since they are erased at runtime . ( Typing [ 4124 ] ) <nl> + Erased generics can only be used in type hints because they do not exist at runtime . ( Typing [ 4124 ] ) <nl> File " reference_generic . php " , line 5 , characters 3 - 9 : <nl> T cannot be used with ` new ` because it does not have the < < __Newable > > attribute ( Typing [ 4309 ] ) <nl> File " reference_generic . php " , line 9 , characters 3 - 9 : <nl> new file mode 100644 <nl> index 00000000000 . . 0cc8c38a679 <nl> mmm / dev / null <nl> ppp b / hphp / hack / test / typecheck / reified_generics / soft_reified_within_function . php <nl> <nl> + < ? hh / / strict <nl> + / / Copyright 2004 - present Facebook . All Rights Reserved . <nl> + <nl> + final class C { <nl> + public static function f ( ) : void { } <nl> + } <nl> + <nl> + function f < <nl> + < < __Newable , __Enforceable > > reify Thard as C , <nl> + < < __Soft , __Newable , __Enforceable > > reify Tsoft as C , <nl> + > ( ) : void { <nl> + 4 as Thard ; <nl> + 5 as Tsoft ; <nl> + <nl> + new Thard ( ) ; <nl> + new Tsoft ( ) ; <nl> + <nl> + Thard : : f ( ) ; <nl> + Tsoft : : f ( ) ; <nl> + } <nl> new file mode 100644 <nl> index 00000000000 . . 0f603d0c13a <nl> mmm / dev / null <nl> ppp b / hphp / hack / test / typecheck / reified_generics / soft_reified_within_function . php . exp <nl> <nl> + File " soft_reified_within_function . php " , line 16 , characters 7 - 11 : <nl> + Soft reified generics can only be used in type hints because they do not exist at runtime . ( Typing [ 4124 ] ) <nl> + File " soft_reified_within_function . php " , line 19 , characters 3 - 7 : <nl> + Soft reified generics can only be used in type hints because they do not exist at runtime . ( Typing [ 4124 ] ) <nl> + File " soft_reified_within_function . php " , line 13 , characters 8 - 12 : <nl> + Invalid " as " expression hint ( Typing [ 4195 ] ) <nl> + File " soft_reified_within_function . php " , line 13 , characters 8 - 12 : <nl> + The " as " operator cannot be used with a soft reified generic type parameter <nl> mmm a / hphp / hack / test / typecheck / runtime_generic_bad . php . exp <nl> ppp b / hphp / hack / test / typecheck / runtime_generic_bad . php . exp <nl> <nl> File " runtime_generic_bad . php " , line 4 , characters 10 - 10 : <nl> - Erased generics can only be used in type hints since they are erased at runtime . ( Typing [ 4124 ] ) <nl> + Erased generics can only be used in type hints because they do not exist at runtime . ( Typing [ 4124 ] ) <nl>
|
Demote soft reified type parameters
|
facebook/hhvm
|
b83cb96e49f73d690525473dab22c6c665add6ef
|
2019-03-21T00:04:54Z
|
mmm a / buildscripts / resmokeconfig / suites / aggregation_mongos_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / aggregation_mongos_passthrough . yml <nl> executor : <nl> set_parameters : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / aggregation_one_shard_sharded_collections . yml <nl> ppp b / buildscripts / resmokeconfig / suites / aggregation_one_shard_sharded_collections . yml <nl> executor : <nl> set_parameters : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / aggregation_sharded_collections_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / aggregation_sharded_collections_passthrough . yml <nl> executor : <nl> set_parameters : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / causally_consistent_jscore_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / causally_consistent_jscore_passthrough . yml <nl> executor : <nl> asio : 2 <nl> tracking : 0 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> enableMajorityReadConcern : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / causally_consistent_jscore_passthrough_auth . yml <nl> ppp b / buildscripts / resmokeconfig / suites / causally_consistent_jscore_passthrough_auth . yml <nl> executor : <nl> asio : 2 <nl> tracking : 0 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> enableMajorityReadConcern : ' ' <nl> auth : ' ' <nl> keyFile : * keyFile <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_mongos_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_mongos_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_mongos_sessions_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_mongos_sessions_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_secondary_reads . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_secondary_reads . yml <nl> executor : <nl> asio : 2 <nl> tracking : 0 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> logComponentVerbosity : <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_sharded_collections_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_sharded_collections_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> writePeriodicNoops : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_whole_cluster_mongos_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_whole_cluster_mongos_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_whole_cluster_secondary_reads_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_whole_cluster_secondary_reads_passthrough . yml <nl> executor : <nl> asio : 2 <nl> tracking : 0 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> logComponentVerbosity : <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_whole_cluster_sharded_collections_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_whole_cluster_sharded_collections_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> writePeriodicNoops : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_whole_db_mongos_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_whole_db_mongos_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_whole_db_secondary_reads_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_whole_db_secondary_reads_passthrough . yml <nl> executor : <nl> asio : 2 <nl> tracking : 0 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> logComponentVerbosity : <nl> mmm a / buildscripts / resmokeconfig / suites / change_streams_whole_db_sharded_collections_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / change_streams_whole_db_sharded_collections_passthrough . yml <nl> executor : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> bind_ip_all : ' ' <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> writePeriodicNoops : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / jstestfuzz . yml <nl> ppp b / buildscripts / resmokeconfig / suites / jstestfuzz . yml <nl> executor : <nl> set_parameters : <nl> disableLogicalSessionCacheRefresh : false <nl> enableTestCommands : 1 <nl> - smallfiles : ' ' <nl> verbose : ' ' <nl> mmm a / buildscripts / resmokeconfig / suites / jstestfuzz_interrupt . yml <nl> ppp b / buildscripts / resmokeconfig / suites / jstestfuzz_interrupt . yml <nl> executor : <nl> set_parameters : <nl> disableLogicalSessionCacheRefresh : false <nl> enableTestCommands : 1 <nl> - smallfiles : ' ' <nl> verbose : ' ' <nl> mmm a / buildscripts / resmokeconfig / suites / sharded_causally_consistent_jscore_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / sharded_causally_consistent_jscore_passthrough . yml <nl> executor : <nl> verbosity : 1 <nl> asio : 2 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> enableMajorityReadConcern : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> mmm a / buildscripts / resmokeconfig / suites / sharded_collections_jscore_passthrough . yml <nl> ppp b / buildscripts / resmokeconfig / suites / sharded_collections_jscore_passthrough . yml <nl> executor : <nl> set_parameters : <nl> enableTestCommands : 1 <nl> mongod_options : <nl> - nopreallocj : ' ' <nl> set_parameters : <nl> enableTestCommands : 1 <nl> numInitialSyncAttempts : 1 <nl> mmm a / buildscripts / resmokelib / config . py <nl> ppp b / buildscripts / resmokelib / config . py <nl> <nl> " no_journal " : False , <nl> " num_clients_per_fixture " : 1 , <nl> " perf_report_file " : None , <nl> - " prealloc_journal " : None , # Default is set on the commandline . <nl> " repeat " : 1 , <nl> " report_failure_status " : " fail " , <nl> " report_file " : None , <nl> def resolve ( self ) : <nl> # enabled . <nl> NO_JOURNAL = None <nl> <nl> - # If true , then all mongod ' s started by resmoke . py and by the mongo shell will not preallocate <nl> - # journal files . <nl> - NO_PREALLOC_JOURNAL = None <nl> - <nl> # If set , then each fixture runs tests with the specified number of clients . <nl> NUM_CLIENTS_PER_FIXTURE = None <nl> <nl> mmm a / buildscripts / resmokelib / core / programs . py <nl> ppp b / buildscripts / resmokelib / core / programs . py <nl> def mongod_program ( # pylint : disable = too - many - branches <nl> <nl> shortcut_opts = { <nl> " nojournal " : config . NO_JOURNAL , <nl> - " nopreallocj " : config . NO_PREALLOC_JOURNAL , <nl> " serviceExecutor " : config . SERVICE_EXECUTOR , <nl> " storageEngine " : config . STORAGE_ENGINE , <nl> " transportLayer " : config . TRANSPORT_LAYER , <nl> def mongod_program ( # pylint : disable = too - many - branches <nl> shortcut_opts [ " wiredTigerCacheSizeGB " ] = config . STORAGE_ENGINE_CACHE_SIZE <nl> <nl> # These options are just flags , so they should not take a value . <nl> - opts_without_vals = ( " nojournal " , " nopreallocj " ) <nl> + opts_without_vals = ( " nojournal " , ) <nl> <nl> # Have the - - nojournal command line argument to resmoke . py unset the journal option . <nl> if shortcut_opts [ " nojournal " ] and " journal " in kwargs : <nl> def mongo_shell_program ( # pylint : disable = too - many - branches , too - many - locals , to <nl> <nl> shortcut_opts = { <nl> " noJournal " : ( config . NO_JOURNAL , False ) , <nl> - " noJournalPrealloc " : ( config . NO_PREALLOC_JOURNAL , False ) , <nl> " serviceExecutor " : ( config . SERVICE_EXECUTOR , " " ) , <nl> " storageEngine " : ( config . STORAGE_ENGINE , " " ) , <nl> " storageEngineCacheSizeGB " : ( config . STORAGE_ENGINE_CACHE_SIZE , " " ) , <nl> mmm a / buildscripts / resmokelib / parser . py <nl> ppp b / buildscripts / resmokelib / parser . py <nl> def _make_parser ( ) : # pylint : disable = too - many - statements <nl> parser . add_option ( " - - nojournal " , action = " store_true " , dest = " no_journal " , <nl> help = " Disables journaling for all mongod ' s . " ) <nl> <nl> - parser . add_option ( " - - nopreallocj " , action = " store_const " , const = " off " , dest = " prealloc_journal " , <nl> - help = " Disables preallocation of journal files for all mongod processes . " ) <nl> - <nl> parser . add_option ( " - - numClientsPerFixture " , type = " int " , dest = " num_clients_per_fixture " , <nl> help = " Number of clients running tests per fixture . " ) <nl> <nl> parser . add_option ( " - - perfReportFile " , dest = " perf_report_file " , metavar = " PERF_REPORT " , <nl> help = " Writes a JSON file with performance test results . " ) <nl> <nl> - parser . add_option ( " - - preallocJournal " , type = " choice " , action = " store " , dest = " prealloc_journal " , <nl> - choices = ( " on " , " off " ) , metavar = " ON | OFF " , <nl> - help = ( " Enables or disables preallocation of journal files for all mongod " <nl> - " processes . Defaults to % default . " ) ) <nl> - <nl> parser . add_option ( " - - shellConnString " , dest = " shell_conn_string " , metavar = " CONN_STRING " , <nl> help = " Overrides the default fixture and connect to an existing MongoDB " <nl> " cluster instead . This is useful for connecting to a MongoDB " <nl> def _make_parser ( ) : # pylint : disable = too - many - statements <nl> metavar = " BENCHMARK_REPETITIONS " , help = benchmark_repetitions_help ) <nl> <nl> parser . set_defaults ( logger_file = " console " , dry_run = " off " , find_suites = False , list_suites = False , <nl> - suite_files = " with_server " , prealloc_journal = " off " , shuffle = " auto " , <nl> - stagger_jobs = " off " ) <nl> + suite_files = " with_server " , shuffle = " auto " , stagger_jobs = " off " ) <nl> return parser <nl> <nl> <nl> def _update_config_vars ( values ) : # pylint : disable = too - many - statements <nl> _config . MONGOS_EXECUTABLE = _expand_user ( config . pop ( " mongos_executable " ) ) <nl> _config . MONGOS_SET_PARAMETERS = config . pop ( " mongos_set_parameters " ) <nl> _config . NO_JOURNAL = config . pop ( " no_journal " ) <nl> - _config . NO_PREALLOC_JOURNAL = config . pop ( " prealloc_journal " ) = = " off " <nl> _config . NUM_CLIENTS_PER_FIXTURE = config . pop ( " num_clients_per_fixture " ) <nl> _config . PERF_REPORT_FILE = config . pop ( " perf_report_file " ) <nl> _config . RANDOM_SEED = config . pop ( " seed " ) <nl> mmm a / jstests / auth / access_control_with_unreachable_configs . js <nl> ppp b / jstests / auth / access_control_with_unreachable_configs . js <nl> <nl> / / there are . <nl> / / @ tags : [ requires_sharding ] <nl> <nl> - var dopts = { smallfiles : " " , nopreallocj : " " } ; <nl> - <nl> / / TODO : Remove ' shardAsReplicaSet : false ' when SERVER - 32672 is fixed . <nl> var st = new ShardingTest ( { <nl> shards : 1 , <nl> var st = new ShardingTest ( { <nl> config : 1 , <nl> keyFile : ' jstests / libs / key1 ' , <nl> useHostname : false , / / Needed when relying on the localhost exception <nl> - other : { <nl> - shardOptions : dopts , <nl> - configOptions : dopts , <nl> - mongosOptions : { verbose : 1 } , <nl> - shardAsReplicaSet : false <nl> - } <nl> + other : { mongosOptions : { verbose : 1 } , shardAsReplicaSet : false } <nl> } ) ; <nl> var mongos = st . s ; <nl> var config = st . config0 ; <nl> mmm a / jstests / auth / auth2 . js <nl> ppp b / jstests / auth / auth2 . js <nl> <nl> / / test read / write permissions <nl> <nl> - m = MongoRunner . runMongod ( { auth : " " , bind_ip : " 127 . 0 . 0 . 1 " , smallfiles : " " } ) ; <nl> + m = MongoRunner . runMongod ( { auth : " " , bind_ip : " 127 . 0 . 0 . 1 " } ) ; <nl> db = m . getDB ( " admin " ) ; <nl> <nl> / / These statements throw because the localhost exception does not allow <nl> mmm a / jstests / auth / auth_helpers . js <nl> ppp b / jstests / auth / auth_helpers . js <nl> <nl> ( function ( ) { <nl> ' use strict ' ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> const admin = conn . getDB ( ' admin ' ) ; <nl> <nl> admin . createUser ( { user : ' andy ' , pwd : ' a ' , roles : jsTest . adminUserRoles } ) ; <nl> mmm a / jstests / auth / db_multiple_login . js <nl> ppp b / jstests / auth / db_multiple_login . js <nl> <nl> / / authentication . <nl> / / <nl> / / Regression test for SERVER - 8144 . <nl> - var conn = MongoRunner . runMongod ( { auth : " " , smallfiles : " " } ) ; <nl> + var conn = MongoRunner . runMongod ( { auth : " " } ) ; <nl> var admin = conn . getDB ( " admin " ) ; <nl> var test = conn . getDB ( " test " ) ; <nl> <nl> test . foo . findOne ( ) ; <nl> test . auth ( ' reader ' , ' a ' ) ; <nl> assert . writeError ( test . docs . insert ( { value : 2 } ) ) ; <nl> test . foo . findOne ( ) ; <nl> - MongoRunner . stopMongod ( conn , null , { user : ' admin ' , pwd : ' a ' } ) ; <nl> \ No newline at end of file <nl> + MongoRunner . stopMongod ( conn , null , { user : ' admin ' , pwd : ' a ' } ) ; <nl> mmm a / jstests / auth / disable_localhost_bypass . js <nl> ppp b / jstests / auth / disable_localhost_bypass . js <nl> <nl> - var conn1 = MongoRunner . runMongod ( <nl> - { auth : " " , smallfiles : " " , setParameter : " enableLocalhostAuthBypass = true " } ) ; <nl> - var conn2 = MongoRunner . runMongod ( <nl> - { auth : " " , smallfiles : " " , setParameter : " enableLocalhostAuthBypass = false " } ) ; <nl> + var conn1 = MongoRunner . runMongod ( { auth : " " , setParameter : " enableLocalhostAuthBypass = true " } ) ; <nl> + var conn2 = MongoRunner . runMongod ( { auth : " " , setParameter : " enableLocalhostAuthBypass = false " } ) ; <nl> <nl> / / Should fail because of localhost exception narrowed ( SERVER - 12621 ) . <nl> assert . writeError ( conn1 . getDB ( " test " ) . foo . insert ( { a : 1 } ) ) ; <nl> assert . throws ( function ( ) { <nl> <nl> print ( " SUCCESS Completed disable_localhost_bypass . js " ) ; <nl> MongoRunner . stopMongod ( conn1 , null , { user : " root " , pwd : " pass " } ) ; <nl> - MongoRunner . stopMongod ( conn2 , null , { user : " root " , pwd : " pass " } ) ; <nl> \ No newline at end of file <nl> + MongoRunner . stopMongod ( conn2 , null , { user : " root " , pwd : " pass " } ) ; <nl> mmm a / jstests / auth / js_scope_leak . js <nl> ppp b / jstests / auth / js_scope_leak . js <nl> <nl> / / <nl> / / These transitions are tested for $ where and MapReduce . <nl> <nl> - var conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + var conn = MongoRunner . runMongod ( ) ; <nl> var test = conn . getDB ( " test " ) ; <nl> <nl> / / insert a single document and add two test users <nl> mmm a / jstests / auth / show_log_auth . js <nl> ppp b / jstests / auth / show_log_auth . js <nl> <nl> <nl> var baseName = " jstests_show_log_auth " ; <nl> <nl> - var m = MongoRunner . runMongod ( { auth : " " , bind_ip : " 127 . 0 . 0 . 1 " , smallfiles : " " } ) ; <nl> + var m = MongoRunner . runMongod ( { auth : " " , bind_ip : " 127 . 0 . 0 . 1 " } ) ; <nl> var db = m . getDB ( " admin " ) ; <nl> <nl> db . createUser ( { user : " admin " , pwd : " pass " , roles : jsTest . adminUserRoles } ) ; <nl> mmm a / jstests / auth / system_user_privileges . js <nl> ppp b / jstests / auth / system_user_privileges . js <nl> <nl> " On " + dbName + " . " + collectionName ) ; <nl> } <nl> <nl> - var conn = MongoRunner . runMongod ( { smallfiles : " " , auth : " " } ) ; <nl> + var conn = MongoRunner . runMongod ( { auth : " " } ) ; <nl> <nl> var admin = conn . getDB ( ' admin ' ) ; <nl> var test = conn . getDB ( ' test ' ) ; <nl> mmm a / jstests / disk / too_many_fds . js <nl> ppp b / jstests / disk / too_many_fds . js <nl> <nl> function doTest ( ) { <nl> var baseName = " jstests_disk_too_many_fds " ; <nl> <nl> - var m = MongoRunner . runMongod ( { smallfiles : " " , nssize : 1 } ) ; <nl> + var m = MongoRunner . runMongod ( { nssize : 1 } ) ; <nl> / / Make 1026 collections , each in a separate database . On some storage engines , this may cause <nl> / / 1026 files to be created . <nl> for ( var i = 1 ; i < 1026 ; + + i ) { <nl> function doTest ( ) { <nl> MongoRunner . stopMongod ( m ) ; <nl> <nl> / / Ensure we can still start up with that many files . <nl> - var m2 = MongoRunner . runMongod ( <nl> - { dbpath : m . dbpath , smallfiles : " " , nssize : 1 , restart : true , cleanData : false } ) ; <nl> + var m2 = MongoRunner . runMongod ( { dbpath : m . dbpath , nssize : 1 , restart : true , cleanData : false } ) ; <nl> assert . eq ( 1 , m2 . getDB ( " db1025 " ) . getCollection ( " coll1025 " ) . count ( ) ) ; <nl> MongoRunner . stopMongod ( m2 ) ; <nl> <nl> mmm a / jstests / noPassthrough / devnull . js <nl> ppp b / jstests / noPassthrough / devnull . js <nl> <nl> ( function ( ) { <nl> - var mongo = MongoRunner . runMongod ( { smallfiles : " " , storageEngine : " devnull " } ) ; <nl> + var mongo = MongoRunner . runMongod ( { storageEngine : " devnull " } ) ; <nl> <nl> db = mongo . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / geo_full . js <nl> ppp b / jstests / noPassthrough / geo_full . js <nl> <nl> <nl> load ( " jstests / libs / geo_math . js " ) ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> const db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / geo_mnypts_plus_fields . js <nl> ppp b / jstests / noPassthrough / geo_mnypts_plus_fields . js <nl> <nl> <nl> ( function ( ) { <nl> " use strict " ; <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> const db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / geo_near_random1 . js <nl> ppp b / jstests / noPassthrough / geo_near_random1 . js <nl> var db ; <nl> " use strict " ; <nl> load ( " jstests / libs / geo_near_random . js " ) ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / geo_near_random2 . js <nl> ppp b / jstests / noPassthrough / geo_near_random2 . js <nl> var db ; <nl> " use strict " ; <nl> load ( " jstests / libs / geo_near_random . js " ) ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / index_killop . js <nl> ppp b / jstests / noPassthrough / index_killop . js <nl> <nl> ( function ( ) { <nl> " use strict " ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod was unable to start up " ) ; <nl> <nl> const testDB = conn . getDB ( " test " ) ; <nl> mmm a / jstests / noPassthrough / indexbg1 . js <nl> ppp b / jstests / noPassthrough / indexbg1 . js <nl> <nl> <nl> load ( " jstests / noPassthrough / libs / index_build . js " ) ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " , nojournal : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( { nojournal : " " } ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> var db = conn . getDB ( " test " ) ; <nl> var baseName = " jstests_indexbg1 " ; <nl> mmm a / jstests / noPassthrough / indexbg2 . js <nl> ppp b / jstests / noPassthrough / indexbg2 . js <nl> <nl> load ( " jstests / noPassthrough / libs / index_build . js " ) ; <nl> load ( " jstests / libs / check_log . js " ) ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " , nojournal : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( { nojournal : " " } ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> <nl> let db = conn . getDB ( " test " ) ; <nl> mmm a / jstests / noPassthrough / list_indexes_only_ready_indexes . js <nl> ppp b / jstests / noPassthrough / list_indexes_only_ready_indexes . js <nl> <nl> <nl> load ( " jstests / noPassthrough / libs / index_build . js " ) ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod was unable to start up " ) ; <nl> <nl> const testDB = conn . getDB ( " test " ) ; <nl> mmm a / jstests / noPassthrough / lock_file . js <nl> ppp b / jstests / noPassthrough / lock_file . js <nl> <nl> var dbpath = MongoRunner . dataPath + baseName + ' / ' ; <nl> <nl> / / Test framework will append - - storageEngine command line option . <nl> - var mongod = MongoRunner . runMongod ( { dbpath : dbpath , smallfiles : " " } ) ; <nl> + var mongod = MongoRunner . runMongod ( { dbpath : dbpath } ) ; <nl> assert . neq ( 0 , <nl> getMongodLockFileSize ( dbpath ) , <nl> ' mongod . lock should not be empty while server is running ' ) ; <nl> mmm a / jstests / noPassthrough / ns1 . js <nl> ppp b / jstests / noPassthrough / ns1 . js <nl> <nl> ( function ( ) { <nl> " use strict " ; <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> let mydb = conn . getDB ( " test_ns1 " ) ; <nl> <nl> mmm a / jstests / noPassthrough / query_yield1 . js <nl> ppp b / jstests / noPassthrough / query_yield1 . js <nl> <nl> ( function ( ) { <nl> " use strict " ; <nl> if ( 0 ) { / / Test disabled until SERVER - 8579 is finished . Reminder ticket : SERVER - 8342 <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " , nojournal : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( { nojournal : " " } ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / query_yield2 . js <nl> ppp b / jstests / noPassthrough / query_yield2 . js <nl> <nl> var start ; <nl> var insertTime ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " , nojournal : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( { nojournal : " " } ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthrough / repair2 . js <nl> ppp b / jstests / noPassthrough / repair2 . js <nl> <nl> " use strict " ; <nl> const baseName = " jstests_repair2 " ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> <nl> const t = conn . getDB ( baseName ) [ baseName ] ; <nl> mmm a / jstests / noPassthrough / system_indexes . js <nl> ppp b / jstests / noPassthrough / system_indexes . js <nl> <nl> * / <nl> <nl> ( function ( ) { <nl> - let conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + let conn = MongoRunner . runMongod ( ) ; <nl> let config = conn . getDB ( " config " ) ; <nl> let db = conn . getDB ( " admin " ) ; <nl> <nl> mmm a / jstests / noPassthrough / update_server - 5552 . js <nl> ppp b / jstests / noPassthrough / update_server - 5552 . js <nl> <nl> var db ; <nl> ( function ( ) { <nl> " use strict " ; <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( ) ; <nl> assert . neq ( null , conn , " mongod failed to start . " ) ; <nl> db = conn . getDB ( " test " ) ; <nl> <nl> mmm a / jstests / noPassthroughWithMongod / newcollection2 . js <nl> ppp b / jstests / noPassthroughWithMongod / newcollection2 . js <nl> <nl> / / Alocate collection forcing just a small size remainder in 2nd extent <nl> <nl> var baseName = " jstests_disk_newcollection2 " ; <nl> - var m = MongoRunner . runMongod ( { noprealloc : " " , smallfiles : " " } ) ; <nl> + var m = MongoRunner . runMongod ( { noprealloc : " " } ) ; <nl> db = m . getDB ( " test " ) ; <nl> <nl> db . createCollection ( baseName , { size : 0x1FFC0000 - 0x10 - 8192 } ) ; <nl> assert ( v . valid ) ; <nl> db . runCommand ( { applyOps : [ { op : ' u ' , ns : ' a \ 0b ' } ] } ) ; <nl> var res = db [ " a \ 0a " ] . insert ( { } ) ; <nl> assert ( res instanceof WriteCommandError , " A write to collection a \ 0a succceeded " ) ; <nl> - MongoRunner . stopMongod ( m ) ; <nl> \ No newline at end of file <nl> + MongoRunner . stopMongod ( m ) ; <nl> mmm a / jstests / noPassthroughWithMongod / temp_namespace . js <nl> ppp b / jstests / noPassthroughWithMongod / temp_namespace . js <nl> <nl> <nl> testname = ' temp_namespace_sw ' ; <nl> <nl> - var conn = MongoRunner . runMongod ( { smallfiles : " " , noprealloc : " " , nopreallocj : " " } ) ; <nl> + var conn = MongoRunner . runMongod ( { noprealloc : " " } ) ; <nl> d = conn . getDB ( ' test ' ) ; <nl> d . runCommand ( { create : testname + ' temp1 ' , temp : true } ) ; <nl> d [ testname + ' temp1 ' ] . ensureIndex ( { x : 1 } ) ; <nl> conn = MongoRunner . runMongod ( { <nl> restart : true , <nl> cleanData : false , <nl> dbpath : conn . dbpath , <nl> - smallfiles : " " , <nl> noprealloc : " " , <nl> - nopreallocj : " " <nl> } ) ; <nl> d = conn . getDB ( ' test ' ) ; <nl> assert . eq ( countCollectionNames ( d , / temp \ d $ / ) , 0 ) ; <nl> mmm a / jstests / readonly / lib / read_only_test . js <nl> ppp b / jstests / readonly / lib / read_only_test . js <nl> var StandaloneFixture , ShardedFixture , runReadOnlyTest , zip2 , cycleN ; <nl> <nl> ShardedFixture . prototype . runLoadPhase = function runLoadPhase ( test ) { <nl> / / TODO : SERVER - 33830 remove shardAsReplicaSet : false <nl> - this . shardingTest = new ShardingTest ( { <nl> - nopreallocj : true , <nl> - mongos : 1 , <nl> - shards : this . nShards , <nl> - other : { shardAsReplicaSet : false } <nl> - } ) ; <nl> + this . shardingTest = <nl> + new ShardingTest ( { mongos : 1 , shards : this . nShards , other : { shardAsReplicaSet : false } } ) ; <nl> <nl> this . paths = this . shardingTest . getDBPaths ( ) ; <nl> <nl> mmm a / jstests / replsets / oplog_format . js <nl> ppp b / jstests / replsets / oplog_format . js <nl> <nl> * / <nl> <nl> " use strict " ; <nl> - var replTest = new ReplSetTest ( { nodes : 1 , oplogSize : 2 , nodeOptions : { smallfiles : " " } } ) ; <nl> + var replTest = new ReplSetTest ( { nodes : 1 , oplogSize : 2 } ) ; <nl> var nodes = replTest . startSet ( ) ; <nl> replTest . initiate ( ) ; <nl> var master = replTest . getPrimary ( ) ; <nl> mmm a / jstests / replsets / oplog_wallclock . js <nl> ppp b / jstests / replsets / oplog_wallclock . js <nl> <nl> } ; <nl> <nl> var name = ' wt_test_coll ' ; <nl> - var replSet = new ReplSetTest ( { nodes : 1 , oplogSize : 2 , nodeOptions : { smallfiles : ' ' } } ) ; <nl> + var replSet = new ReplSetTest ( { nodes : 1 , oplogSize : 2 } ) ; <nl> replSet . startSet ( ) ; <nl> replSet . initiate ( ) ; <nl> <nl> mmm a / jstests / sharding / mr_noscripting . js <nl> ppp b / jstests / sharding / mr_noscripting . js <nl> var shardOpts = [ <nl> { } / / just use default params <nl> ] ; <nl> <nl> - var st = new ShardingTest ( { shards : shardOpts , other : { nopreallocj : 1 } } ) ; <nl> + var st = new ShardingTest ( { shards : shardOpts } ) ; <nl> var mongos = st . s ; <nl> <nl> st . shardColl ( ' bar ' , { x : 1 } ) ; <nl> mongos . getDB ( ' config ' ) . shards . find ( ) . forEach ( function ( shardDoc ) { <nl> assert ( cmdResult . ok , <nl> ' serverStatus on ' + shardDoc . host + ' failed , result : ' + tojson ( cmdResult ) ) ; <nl> } ) ; <nl> - st . stop ( ) ; <nl> \ No newline at end of file <nl> + st . stop ( ) ; <nl> mmm a / jstests / sharding / printShardingStatus . js <nl> ppp b / jstests / sharding / printShardingStatus . js <nl> <nl> ( function ( ) { <nl> ' use strict ' ; <nl> <nl> - var st = new ShardingTest ( { shards : 1 , mongos : 2 , config : 1 , other : { smallfiles : true } } ) ; <nl> + var st = new ShardingTest ( { shards : 1 , mongos : 2 , config : 1 } ) ; <nl> <nl> var standalone = MongoRunner . runMongod ( ) ; <nl> <nl> mmm a / jstests / slow1 / conc_update . js <nl> ppp b / jstests / slow1 / conc_update . js <nl> <nl> ( function ( ) { <nl> " use strict " ; <nl> <nl> - const conn = MongoRunner . runMongod ( { smallfiles : " " , nojournal : " " } ) ; <nl> + const conn = MongoRunner . runMongod ( { nojournal : " " } ) ; <nl> assert . neq ( null , conn , " mongod was unable to start up " ) ; <nl> db = conn . getDB ( " concurrency " ) ; <nl> db . dropDatabase ( ) ; <nl> mmm a / jstests / ssl / disable_x509 . js <nl> ppp b / jstests / ssl / disable_x509 . js <nl> <nl> var CLIENT_USER = " C = US , ST = New York , L = New York City , O = MongoDB , OU = KernelUser , CN = client " ; <nl> <nl> var conn = MongoRunner . runMongod ( { <nl> - smallfiles : " " , <nl> auth : " " , <nl> sslMode : " requireSSL " , <nl> sslPEMKeyFile : " jstests / libs / server . pem " , <nl> if ( cmdOut . ok ) { <nl> MongoRunner . stopMongod ( conn ) ; <nl> } else { <nl> MongoRunner . stopMongod ( conn ) ; <nl> - } <nl> \ No newline at end of file <nl> + } <nl> mmm a / jstests / ssl / ssl_alert_reporting . js <nl> ppp b / jstests / ssl / ssl_alert_reporting . js <nl> load ( ' jstests / ssl / libs / ssl_helpers . js ' ) ; <nl> } <nl> <nl> var md = MongoRunner . runMongod ( { <nl> - nopreallocj : " " , <nl> sslMode : " requireSSL " , <nl> sslCAFile : " jstests / libs / ca . pem " , <nl> sslPEMKeyFile : " jstests / libs / server . pem " , <nl> mmm a / jstests / ssl / ssl_cert_password . js <nl> ppp b / jstests / ssl / ssl_cert_password . js <nl> requireSSLProvider ( ' openssl ' , function ( ) { <nl> <nl> / / Password is correct <nl> var md = MongoRunner . runMongod ( { <nl> - nopreallocj : " " , <nl> dbpath : dbpath , <nl> sslMode : " requireSSL " , <nl> sslPEMKeyFile : " jstests / libs / password_protected . pem " , <nl> mmm a / jstests / ssl / x509_client . js <nl> ppp b / jstests / ssl / x509_client . js <nl> <nl> / / Check if this build supports the authenticationMechanisms startup parameter . <nl> var conn = MongoRunner . runMongod ( { <nl> - smallfiles : " " , <nl> auth : " " , <nl> sslMode : " requireSSL " , <nl> sslPEMKeyFile : " jstests / libs / server . pem " , <nl> mmm a / src / mongo / dbtests / framework_options . cpp <nl> ppp b / src / mongo / dbtests / framework_options . cpp <nl> Status addTestFrameworkOptions ( moe : : OptionSection * options ) { <nl> <nl> options - > addOptionChaining ( " list " , " list , l " , moe : : Switch , " list available test suites " ) ; <nl> <nl> - options - > addOptionChaining ( " bigfiles " , <nl> - " bigfiles " , <nl> - moe : : Switch , <nl> - " use big datafiles instead of smallfiles which is the default " ) ; <nl> - <nl> options - > addOptionChaining ( <nl> " filter " , " filter , f " , moe : : String , " string substring filter on test name " ) ; <nl> <nl> Status addTestFrameworkOptions ( moe : : OptionSection * options ) { <nl> . hidden ( ) <nl> . positional ( 1 , - 1 ) ; <nl> <nl> - options <nl> - - > addOptionChaining ( " nopreallocj " , " nopreallocj " , moe : : Switch , " disable journal prealloc " ) <nl> - . hidden ( ) ; <nl> - <nl> - <nl> return Status : : OK ( ) ; <nl> } <nl> <nl> mmm a / src / mongo / shell / replsettest . js <nl> ppp b / src / mongo / shell / replsettest . js <nl> var ReplSetTest = function ( opts ) { <nl> keyFile : this . keyFile , <nl> port : _useBridge ? _unbridgedPorts [ n ] : this . ports [ n ] , <nl> noprealloc : " " , <nl> - smallfiles : " " , <nl> replSet : this . useSeedList ? this . getURL ( ) : this . name , <nl> dbpath : " $ set - $ node " <nl> } ; <nl> mmm a / src / mongo / shell / servers . js <nl> ppp b / src / mongo / shell / servers . js <nl> var MongoRunner , _startMongod , startMongoProgram , runMongoProgram , startMongoPro <nl> noReplSet : true , <nl> forgetPort : true , <nl> arbiter : true , <nl> - noJournalPrealloc : true , <nl> noJournal : true , <nl> binVersion : true , <nl> waitForConnect : true , <nl> var MongoRunner , _startMongod , startMongoProgram , runMongoProgram , startMongoPro <nl> if ( ! o . binVersion ) <nl> return true ; <nl> <nl> - / / Version 1 . x options <nl> - if ( o . binVersion . startsWith ( " 1 . " ) ) { <nl> - return [ " nopreallocj " ] . indexOf ( option ) < 0 ; <nl> - } <nl> - <nl> return true ; <nl> } ; <nl> <nl> var MongoRunner , _startMongod , startMongoProgram , runMongoProgram , startMongoPro <nl> * useLogFiles { boolean } : use with logFile option . <nl> * logFile { string } : path to the log file . If not specified and useLogFiles <nl> * is true , automatically creates a log file inside dbpath . <nl> - * noJournalPrealloc { boolean } <nl> * noJournal { boolean } <nl> * keyFile <nl> * replSet <nl> var MongoRunner , _startMongod , startMongoProgram , runMongoProgram , startMongoPro <nl> opts . logpath = opts . logFile ; <nl> } <nl> <nl> - if ( jsTestOptions ( ) . noJournalPrealloc | | opts . noJournalPrealloc ) <nl> - opts . nopreallocj = " " ; <nl> - <nl> if ( ( jsTestOptions ( ) . noJournal | | opts . noJournal ) & & ! ( ' journal ' in opts ) & & <nl> ! ( ' configsvr ' in opts ) ) { <nl> opts . nojournal = " " ; <nl> mmm a / src / mongo / shell / servers_misc . js <nl> ppp b / src / mongo / shell / servers_misc . js <nl> ToolTest = function ( name , extraOptions ) { <nl> ToolTest . prototype . startDB = function ( coll ) { <nl> assert ( ! this . m , " db already running " ) ; <nl> <nl> - var options = { <nl> - port : this . port , <nl> - dbpath : this . dbpath , <nl> - noprealloc : " " , <nl> - smallfiles : " " , <nl> - bind_ip : " 127 . 0 . 0 . 1 " <nl> - } ; <nl> + var options = { port : this . port , dbpath : this . dbpath , noprealloc : " " , bind_ip : " 127 . 0 . 0 . 1 " } ; <nl> <nl> Object . extend ( options , this . options ) ; <nl> <nl> mmm a / src / mongo / shell / shardingtest . js <nl> ppp b / src / mongo / shell / shardingtest . js <nl> <nl> * name { string } : name for this test <nl> * verbose { number } : the verbosity for the mongos <nl> * chunkSize { number } : the chunk size to use as configuration for the cluster <nl> - * nopreallocj { boolean | number } : <nl> * <nl> * mongos { number | Object | Array . < Object > } : number of mongos or mongos <nl> * configuration object ( s ) ( * ) . @ see MongoRunner . runMongos <nl> <nl> * options take precedence . <nl> * <nl> * other : { <nl> - * nopreallocj : same as above <nl> * rs : same as above <nl> * chunkSize : same as above <nl> * keyFile { string } : the location of the keyFile <nl> var ShardingTest = function ( params ) { <nl> <nl> / / Allow specifying mixed - type options like this : <nl> / / { mongos : [ { noprealloc : " " } ] , <nl> - / / config : [ { smallfiles : " " } ] , <nl> + / / config : [ { nojournal : " " } ] , <nl> / / shards : { rs : true , d : true } } <nl> if ( Array . isArray ( numShards ) ) { <nl> for ( var i = 0 ; i < numShards . length ; i + + ) { <nl> var ShardingTest = function ( params ) { <nl> <nl> var rsDefaults = { <nl> useHostname : otherParams . useHostname , <nl> - noJournalPrealloc : otherParams . nopreallocj , <nl> oplogSize : 16 , <nl> shardsvr : ' ' , <nl> pathOpts : Object . merge ( pathOpts , { shard : i } ) , <nl> var ShardingTest = function ( params ) { <nl> } else { <nl> var options = { <nl> useHostname : otherParams . useHostname , <nl> - noJournalPrealloc : otherParams . nopreallocj , <nl> pathOpts : Object . merge ( pathOpts , { shard : i } ) , <nl> dbpath : " $ testName $ shard " , <nl> shardsvr : ' ' , <nl> var ShardingTest = function ( params ) { <nl> / / Ensure that journaling is always enabled for config servers . <nl> journal : " " , <nl> configsvr : " " , <nl> - noJournalPrealloc : otherParams . nopreallocj , <nl> storageEngine : " wiredTiger " , <nl> } ; <nl> <nl> mmm a / src / mongo / shell / utils . js <nl> ppp b / src / mongo / shell / utils . js <nl> jsTestOptions = function ( ) { <nl> wiredTigerCollectionConfigString : TestData . wiredTigerCollectionConfigString , <nl> wiredTigerIndexConfigString : TestData . wiredTigerIndexConfigString , <nl> noJournal : TestData . noJournal , <nl> - noJournalPrealloc : TestData . noJournalPrealloc , <nl> auth : TestData . auth , <nl> / / Note : keyFile is also used as a flag to indicate cluster auth is turned on , set it <nl> / / to a truthy value if you ' d like to do cluster auth , even if it ' s not keyFile auth . <nl>
|
SERVER - 35715 Remove nopreallocj and smallfiles options from tests
|
mongodb/mongo
|
711c076ef57c0ce3517ab9385c2fd3a005c941b3
|
2018-07-05T12:20:56Z
|
mmm a / CMakeLists . txt <nl> ppp b / CMakeLists . txt <nl> if ( NOT APPLE ) <nl> set ( CMAKE_EXE_LINKER_FLAGS " $ { CMAKE_EXE_LINKER_FLAGS } $ { GLIBC_COMPATIBILITY_LINK_FLAGS } $ { CXX11_ABI_FLAGS } " ) <nl> endif ( ) <nl> <nl> - if ( USE_STATIC_LIBRARIES AND NOT CMAKE_CXX_COMPILER_ID STREQUAL " Clang " ) <nl> + include ( cmake / test_compiler . cmake ) <nl> + if ( USE_STATIC_LIBRARIES AND HAVE_NO_PIE ) <nl> set ( CMAKE_CXX_FLAGS " $ { CMAKE_CXX_FLAGS } - - no - pie " ) <nl> set ( CMAKE_C_FLAGS " $ { CMAKE_C_FLAGS } - - no - pie " ) <nl> endif ( ) <nl> <nl> - <nl> set ( SAN_FLAGS " - O3 - g - fno - omit - frame - pointer " ) <nl> set ( CMAKE_CXX_FLAGS_ASAN " $ { CMAKE_CXX_FLAGS_ASAN } $ { SAN_FLAGS } - fsanitize = address " ) <nl> set ( CMAKE_C_FLAGS_ASAN " $ { CMAKE_C_FLAGS_ASAN } $ { SAN_FLAGS } - fsanitize = address " ) <nl> mmm a / cmake / find_readline_edit . cmake <nl> ppp b / cmake / find_readline_edit . cmake <nl> if ( NOT READLINE_LIB ) <nl> find_library ( READLINE_LIB NAMES readline PATHS $ { READLINE_PATHS } ) <nl> endif ( ) <nl> <nl> - find_library ( TERMCAP_LIB NAMES termcap ) <nl> + list ( APPEND CMAKE_FIND_LIBRARY_SUFFIXES . so . 2 ) <nl> <nl> + find_library ( TERMCAP_LIB NAMES termcap ) <nl> find_library ( EDIT_LIB NAMES edit ) <nl> <nl> set ( READLINE_INCLUDE_PATHS " / usr / local / opt / readline / include " ) <nl> - if ( READLINE_LIB ) <nl> + if ( READLINE_LIB AND TERMCAP_LIB ) <nl> find_path ( READLINE_INCLUDE_DIR NAMES readline / readline . h PATHS $ { READLINE_INCLUDE_PATHS } NO_DEFAULT_PATH ) <nl> if ( NOT READLINE_INCLUDE_DIR ) <nl> find_path ( READLINE_INCLUDE_DIR NAMES readline / readline . h PATHS $ { READLINE_INCLUDE_PATHS } ) <nl> check_cxx_source_runs ( " <nl> int main ( ) { <nl> add_history ( nullptr ) ; <nl> append_history ( 1 , nullptr ) ; <nl> + return 0 ; <nl> } <nl> " HAVE_READLINE_HISTORY ) <nl> mmm a / cmake / find_rt . cmake <nl> ppp b / cmake / find_rt . cmake <nl> <nl> if ( APPLE ) <nl> - find_library ( RT_LIBRARIES apple_rt ) <nl> + # lib from libs / libcommon <nl> + set ( RT_LIBRARIES " apple_rt " ) <nl> else ( ) <nl> find_library ( RT_LIBRARIES rt ) <nl> endif ( ) <nl> new file mode 100644 <nl> index 00000000000 . . 39097d84d01 <nl> mmm / dev / null <nl> ppp b / cmake / test_compiler . cmake <nl> <nl> + include ( CheckCXXSourceCompiles ) <nl> + <nl> + set ( TEST_FLAG " - - no - pie " ) <nl> + set ( CMAKE_REQUIRED_FLAGS " $ { TEST_FLAG } " ) <nl> + check_cxx_source_compiles ( " <nl> + int main ( ) { <nl> + return 0 ; <nl> + } <nl> + " HAVE_NO_PIE ) <nl> + <nl> + set ( CMAKE_REQUIRED_FLAGS " " ) <nl>
|
Merge pull request from proller / cmake
|
ClickHouse/ClickHouse
|
ceb85ca8948d95cb52cc7f762e078ddd11de6647
|
2017-01-30T15:08:06Z
|
mmm a / CHANGELOG <nl> ppp b / CHANGELOG <nl> <nl> - cocos2d - x - 3 . 1 - rc0 May . 16 2014 <nl> + cocos2d - x - 3 . 1 - rc0 May . 18 2014 <nl> [ NEW ] Cocos2dxActivity : Adds a virtual method to load native libraries . <nl> + [ NEW ] Directory Structure : reorder some files within the cocos / folder <nl> + [ NEW ] Sprite3D : a node that renders 3d models <nl> [ NEW ] EditBox : support secure input on Mac <nl> <nl> [ FIX ] Director : twice calling of onExit <nl> mmm a / build / cocos2d_libs . xcodeproj / project . pbxproj <nl> ppp b / build / cocos2d_libs . xcodeproj / project . pbxproj <nl> <nl> 50FCEBCB18C72017004AD434 / * WidgetReaderProtocol . h in Headers * / = { isa = PBXBuildFile ; fileRef = 50FCEB9218C72017004AD434 / * WidgetReaderProtocol . h * / ; } ; <nl> 50FCEBCC18C72017004AD434 / * WidgetReaderProtocol . h in Headers * / = { isa = PBXBuildFile ; fileRef = 50FCEB9218C72017004AD434 / * WidgetReaderProtocol . h * / ; } ; <nl> A07A4CAF1783777C0073F6A7 / * Foundation . framework in Frameworks * / = { isa = PBXBuildFile ; fileRef = 1551A342158F2AB200E66CFE / * Foundation . framework * / ; } ; <nl> + B29594B41926D5EC003EEF37 / * CCMeshCommand . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594B21926D5EC003EEF37 / * CCMeshCommand . cpp * / ; } ; <nl> + B29594B51926D5EC003EEF37 / * CCMeshCommand . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594B21926D5EC003EEF37 / * CCMeshCommand . cpp * / ; } ; <nl> + B29594B61926D5EC003EEF37 / * CCMeshCommand . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594B31926D5EC003EEF37 / * CCMeshCommand . h * / ; } ; <nl> + B29594B71926D5EC003EEF37 / * CCMeshCommand . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594B31926D5EC003EEF37 / * CCMeshCommand . h * / ; } ; <nl> + B29594C21926D61F003EEF37 / * CCMesh . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594B91926D61F003EEF37 / * CCMesh . cpp * / ; } ; <nl> + B29594C31926D61F003EEF37 / * CCMesh . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594B91926D61F003EEF37 / * CCMesh . cpp * / ; } ; <nl> + B29594C41926D61F003EEF37 / * CCMesh . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594BA1926D61F003EEF37 / * CCMesh . h * / ; } ; <nl> + B29594C51926D61F003EEF37 / * CCMesh . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594BA1926D61F003EEF37 / * CCMesh . h * / ; } ; <nl> + B29594C61926D61F003EEF37 / * CCObjLoader . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594BB1926D61F003EEF37 / * CCObjLoader . cpp * / ; } ; <nl> + B29594C71926D61F003EEF37 / * CCObjLoader . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594BB1926D61F003EEF37 / * CCObjLoader . cpp * / ; } ; <nl> + B29594C81926D61F003EEF37 / * CCObjLoader . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594BC1926D61F003EEF37 / * CCObjLoader . h * / ; } ; <nl> + B29594C91926D61F003EEF37 / * CCObjLoader . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594BC1926D61F003EEF37 / * CCObjLoader . h * / ; } ; <nl> + B29594CA1926D61F003EEF37 / * CCSprite3D . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594BD1926D61F003EEF37 / * CCSprite3D . cpp * / ; } ; <nl> + B29594CB1926D61F003EEF37 / * CCSprite3D . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594BD1926D61F003EEF37 / * CCSprite3D . cpp * / ; } ; <nl> + B29594CC1926D61F003EEF37 / * CCSprite3D . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594BE1926D61F003EEF37 / * CCSprite3D . h * / ; } ; <nl> + B29594CD1926D61F003EEF37 / * CCSprite3D . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594BE1926D61F003EEF37 / * CCSprite3D . h * / ; } ; <nl> + B29594CE1926D61F003EEF37 / * CCSprite3DDataCache . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594BF1926D61F003EEF37 / * CCSprite3DDataCache . cpp * / ; } ; <nl> + B29594CF1926D61F003EEF37 / * CCSprite3DDataCache . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B29594BF1926D61F003EEF37 / * CCSprite3DDataCache . cpp * / ; } ; <nl> + B29594D01926D61F003EEF37 / * CCSprite3DDataCache . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594C01926D61F003EEF37 / * CCSprite3DDataCache . h * / ; } ; <nl> + B29594D11926D61F003EEF37 / * CCSprite3DDataCache . h in Headers * / = { isa = PBXBuildFile ; fileRef = B29594C01926D61F003EEF37 / * CCSprite3DDataCache . h * / ; } ; <nl> B37510711823AC9F00B3BA6A / * CCPhysicsBodyInfo_chipmunk . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B37510451823AC7B00B3BA6A / * CCPhysicsBodyInfo_chipmunk . cpp * / ; } ; <nl> B37510721823AC9F00B3BA6A / * CCPhysicsBodyInfo_chipmunk . h in Headers * / = { isa = PBXBuildFile ; fileRef = B37510461823AC7B00B3BA6A / * CCPhysicsBodyInfo_chipmunk . h * / ; } ; <nl> B37510731823AC9F00B3BA6A / * CCPhysicsContactInfo_chipmunk . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = B37510471823AC7B00B3BA6A / * CCPhysicsContactInfo_chipmunk . cpp * / ; } ; <nl> <nl> A07A4F3B178387670073F6A7 / * libchipmunk iOS . a * / = { isa = PBXFileReference ; explicitFileType = archive . ar ; includeInIndex = 0 ; path = " libchipmunk iOS . a " ; sourceTree = BUILT_PRODUCTS_DIR ; } ; <nl> A07A4F9E1783876B0073F6A7 / * libbox2d iOS . a * / = { isa = PBXFileReference ; explicitFileType = archive . ar ; includeInIndex = 0 ; path = " libbox2d iOS . a " ; sourceTree = BUILT_PRODUCTS_DIR ; } ; <nl> A07A4FB4178387730073F6A7 / * libCocosDenshion iOS . a * / = { isa = PBXFileReference ; explicitFileType = archive . ar ; includeInIndex = 0 ; path = " libCocosDenshion iOS . a " ; sourceTree = BUILT_PRODUCTS_DIR ; } ; <nl> + B29594AF1926D5D9003EEF37 / * ccShader_3D_Color . frag * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . glsl ; path = ccShader_3D_Color . frag ; sourceTree = " < group > " ; } ; <nl> + B29594B01926D5D9003EEF37 / * ccShader_3D_ColorTex . frag * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . glsl ; path = ccShader_3D_ColorTex . frag ; sourceTree = " < group > " ; } ; <nl> + B29594B11926D5D9003EEF37 / * ccShader_3D_PositionTex . vert * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . glsl ; path = ccShader_3D_PositionTex . vert ; sourceTree = " < group > " ; } ; <nl> + B29594B21926D5EC003EEF37 / * CCMeshCommand . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCMeshCommand . cpp ; sourceTree = " < group > " ; } ; <nl> + B29594B31926D5EC003EEF37 / * CCMeshCommand . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = CCMeshCommand . h ; sourceTree = " < group > " ; } ; <nl> + B29594B91926D61F003EEF37 / * CCMesh . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCMesh . cpp ; sourceTree = " < group > " ; } ; <nl> + B29594BA1926D61F003EEF37 / * CCMesh . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = CCMesh . h ; sourceTree = " < group > " ; } ; <nl> + B29594BB1926D61F003EEF37 / * CCObjLoader . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCObjLoader . cpp ; sourceTree = " < group > " ; } ; <nl> + B29594BC1926D61F003EEF37 / * CCObjLoader . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = CCObjLoader . h ; sourceTree = " < group > " ; } ; <nl> + B29594BD1926D61F003EEF37 / * CCSprite3D . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCSprite3D . cpp ; sourceTree = " < group > " ; } ; <nl> + B29594BE1926D61F003EEF37 / * CCSprite3D . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = CCSprite3D . h ; sourceTree = " < group > " ; } ; <nl> + B29594BF1926D61F003EEF37 / * CCSprite3DDataCache . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCSprite3DDataCache . cpp ; sourceTree = " < group > " ; } ; <nl> + B29594C01926D61F003EEF37 / * CCSprite3DDataCache . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = CCSprite3DDataCache . h ; sourceTree = " < group > " ; } ; <nl> B37510451823AC7B00B3BA6A / * CCPhysicsBodyInfo_chipmunk . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCPhysicsBodyInfo_chipmunk . cpp ; sourceTree = " < group > " ; } ; <nl> B37510461823AC7B00B3BA6A / * CCPhysicsBodyInfo_chipmunk . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = CCPhysicsBodyInfo_chipmunk . h ; sourceTree = " < group > " ; } ; <nl> B37510471823AC7B00B3BA6A / * CCPhysicsContactInfo_chipmunk . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = CCPhysicsContactInfo_chipmunk . cpp ; sourceTree = " < group > " ; } ; <nl> <nl> children = ( <nl> 46A15FCC1807A544005B8026 / * AUTHORS * / , <nl> 1A57FFF7180BC5160088DEC7 / * CHANGELOG * / , <nl> + 50272539190BF1B900AAF4ED / * cocos2d . cpp * / , <nl> + 50272538190BF1B900AAF4ED / * cocos2d . h * / , <nl> 46A15FCE1807A544005B8026 / * README . md * / , <nl> 50DC5180187B817900A9C23F / * RELEASE_NOTES . md * / , <nl> 46A169A11807B037005B8026 / * 2d * / , <nl> - 50ABBEDB1926664700A911A9 / * platform * / , <nl> + B29594B81926D61F003EEF37 / * 3d * / , <nl> 46A15FD01807A56F005B8026 / * audio * / , <nl> 1A5700A2180BC5E60088DEC7 / * base * / , <nl> 1A01C67518F57BE800EFE3A6 / * deprecated * / , <nl> <nl> 46A170851807CE87005B8026 / * math * / , <nl> 1AAF5360180E3374000584C8 / * network * / , <nl> 46A170611807CE7A005B8026 / * physics * / , <nl> + 50ABBEDB1926664700A911A9 / * platform * / , <nl> 1551A340158F2AB200E66CFE / * Products * / , <nl> 500DC89819105D41007B91BF / * renderer * / , <nl> 1AAF5849180E40B8000584C8 / * storage * / , <nl> 2905F9E618CF08D000240AA3 / * ui * / , <nl> - 50272538190BF1B900AAF4ED / * cocos2d . h * / , <nl> - 50272539190BF1B900AAF4ED / * cocos2d . cpp * / , <nl> ) ; <nl> sourceTree = " < group > " ; <nl> } ; <nl> <nl> 500DC89819105D41007B91BF / * renderer * / = { <nl> isa = PBXGroup ; <nl> children = ( <nl> - 5034CA5D191D591900CE6051 / * shaders * / , <nl> 50ABBD641925AB4100A911A9 / * CCBatchCommand . cpp * / , <nl> 50ABBD651925AB4100A911A9 / * CCBatchCommand . h * / , <nl> 50ABBD661925AB4100A911A9 / * CCCustomCommand . cpp * / , <nl> <nl> 50ABBD711925AB4100A911A9 / * ccGLStateCache . h * / , <nl> 50ABBD721925AB4100A911A9 / * CCGroupCommand . cpp * / , <nl> 50ABBD731925AB4100A911A9 / * CCGroupCommand . h * / , <nl> + B29594B21926D5EC003EEF37 / * CCMeshCommand . cpp * / , <nl> + B29594B31926D5EC003EEF37 / * CCMeshCommand . h * / , <nl> 50ABBD741925AB4100A911A9 / * CCQuadCommand . cpp * / , <nl> 50ABBD751925AB4100A911A9 / * CCQuadCommand . h * / , <nl> 50ABBD761925AB4100A911A9 / * CCRenderCommand . cpp * / , <nl> <nl> 50ABBD801925AB4100A911A9 / * CCTextureAtlas . h * / , <nl> 50ABBD811925AB4100A911A9 / * CCTextureCache . cpp * / , <nl> 50ABBD821925AB4100A911A9 / * CCTextureCache . h * / , <nl> + 5034CA5D191D591900CE6051 / * shaders * / , <nl> ) ; <nl> name = renderer ; <nl> path = . . / cocos / renderer ; <nl> <nl> 5034CA5D191D591900CE6051 / * shaders * / = { <nl> isa = PBXGroup ; <nl> children = ( <nl> + B29594AF1926D5D9003EEF37 / * ccShader_3D_Color . frag * / , <nl> + B29594B01926D5D9003EEF37 / * ccShader_3D_ColorTex . frag * / , <nl> + B29594B11926D5D9003EEF37 / * ccShader_3D_PositionTex . vert * / , <nl> 5034CA60191D91CF00CE6051 / * ccShader_PositionTextureColor . vert * / , <nl> 5034CA61191D91CF00CE6051 / * ccShader_PositionTextureColor . frag * / , <nl> 5034CA62191D91CF00CE6051 / * ccShader_PositionTextureColor_noMVP . vert * / , <nl> <nl> path = TextReader ; <nl> sourceTree = " < group > " ; <nl> } ; <nl> + B29594B81926D61F003EEF37 / * 3d * / = { <nl> + isa = PBXGroup ; <nl> + children = ( <nl> + B29594B91926D61F003EEF37 / * CCMesh . cpp * / , <nl> + B29594BA1926D61F003EEF37 / * CCMesh . h * / , <nl> + B29594BB1926D61F003EEF37 / * CCObjLoader . cpp * / , <nl> + B29594BC1926D61F003EEF37 / * CCObjLoader . h * / , <nl> + B29594BD1926D61F003EEF37 / * CCSprite3D . cpp * / , <nl> + B29594BE1926D61F003EEF37 / * CCSprite3D . h * / , <nl> + B29594BF1926D61F003EEF37 / * CCSprite3DDataCache . cpp * / , <nl> + B29594C01926D61F003EEF37 / * CCSprite3DDataCache . h * / , <nl> + ) ; <nl> + name = 3d ; <nl> + path = . . / cocos / 3d ; <nl> + sourceTree = " < group > " ; <nl> + } ; <nl> B3D8D4471799219B0039C204 / * mac * / = { <nl> isa = PBXGroup ; <nl> children = ( <nl> <nl> 06CAAAC9186AD7EE0012A414 / * TriggerMng . h in Headers * / , <nl> 2905FA6018CF08D100240AA3 / * UILayoutParameter . h in Headers * / , <nl> 50ABBEA51925AB6F00A911A9 / * CCScriptSupport . h in Headers * / , <nl> + B29594D01926D61F003EEF37 / * CCSprite3DDataCache . h in Headers * / , <nl> 1ABA68B01888D700007D1BB4 / * CCFontCharMap . h in Headers * / , <nl> 5034CA3F191D591100CE6051 / * ccShader_Position_uColor . vert in Headers * / , <nl> 50ABBD461925AB0000A911A9 / * CCVertex . h in Headers * / , <nl> <nl> 50ABBD421925AB0000A911A9 / * CCMathBase . h in Headers * / , <nl> 1A570298180BCCAB0088DEC7 / * CCAnimationCache . h in Headers * / , <nl> 50FCEB9D18C72017004AD434 / * ImageViewReader . h in Headers * / , <nl> + B29594C81926D61F003EEF37 / * CCObjLoader . h in Headers * / , <nl> 50ABBE911925AB6F00A911A9 / * CCPlatformMacros . h in Headers * / , <nl> 50ABC05D1926664800A911A9 / * CCApplication . h in Headers * / , <nl> 50ABC0071926664800A911A9 / * CCApplicationProtocol . h in Headers * / , <nl> <nl> 2905FA5818CF08D100240AA3 / * UILayout . h in Headers * / , <nl> 1A57034D180BD09B0088DEC7 / * tinyxml2 . h in Headers * / , <nl> 1A570356180BD0B00088DEC7 / * ioapi . h in Headers * / , <nl> + B29594C41926D61F003EEF37 / * CCMesh . h in Headers * / , <nl> 50ABBE331925AB6F00A911A9 / * CCConfiguration . h in Headers * / , <nl> 50ABC01F1926664800A911A9 / * CCThread . h in Headers * / , <nl> 1A57035A180BD0B00088DEC7 / * unzip . h in Headers * / , <nl> <nl> 1A01C69218F57BE800EFE3A6 / * CCDouble . h in Headers * / , <nl> 50ABBE251925AB6F00A911A9 / * base64 . h in Headers * / , <nl> 50ABBEC91925AB6F00A911A9 / * firePngData . h in Headers * / , <nl> + B29594CC1926D61F003EEF37 / * CCSprite3D . h in Headers * / , <nl> 1AD71E9F180E26E600808F54 / * AnimationStateData . h in Headers * / , <nl> 1AD71EA3180E26E600808F54 / * Atlas . h in Headers * / , <nl> 1AD71EA7180E26E600808F54 / * AtlasAttachmentLoader . h in Headers * / , <nl> <nl> 50ABBE211925AB6F00A911A9 / * atitc . h in Headers * / , <nl> 1A8C5999180E930E00EF57C3 / * CCActionNode . h in Headers * / , <nl> 1A8C599D180E930E00EF57C3 / * CCActionObject . h in Headers * / , <nl> + B29594B61926D5EC003EEF37 / * CCMeshCommand . h in Headers * / , <nl> 50ABBE371925AB6F00A911A9 / * CCConsole . h in Headers * / , <nl> 1A8C59A1180E930E00EF57C3 / * CCArmature . h in Headers * / , <nl> 1A8C59A5180E930E00EF57C3 / * CCArmatureAnimation . h in Headers * / , <nl> <nl> 50ABBD3B1925AB0000A911A9 / * CCAffineTransform . h in Headers * / , <nl> 5034CA38191D591100CE6051 / * ccShader_PositionColorLengthTexture . vert in Headers * / , <nl> 50ABBE7C1925AB6F00A911A9 / * CCEventMouse . h in Headers * / , <nl> + B29594D11926D61F003EEF37 / * CCSprite3DDataCache . h in Headers * / , <nl> 46A171011807CECB005B8026 / * CCPhysicsJoint . h in Headers * / , <nl> 46A170FD1807CECB005B8026 / * CCPhysicsBody . h in Headers * / , <nl> 2905FA6118CF08D100240AA3 / * UILayoutParameter . h in Headers * / , <nl> + B29594C51926D61F003EEF37 / * CCMesh . h in Headers * / , <nl> 50ABBE9C1925AB6F00A911A9 / * CCRef . h in Headers * / , <nl> 50ABBD961925AB4100A911A9 / * CCGLProgramState . h in Headers * / , <nl> 46A171061807CECB005B8026 / * CCPhysicsWorld . h in Headers * / , <nl> <nl> 1AD71DEE180E26E600808F54 / * CCMenuLoader . h in Headers * / , <nl> 1AD71DF2180E26E600808F54 / * CCNode + CCBRelativePositioning . h in Headers * / , <nl> 50ABBDB01925AB4100A911A9 / * CCRenderer . h in Headers * / , <nl> + B29594B71926D5EC003EEF37 / * CCMeshCommand . h in Headers * / , <nl> 1AD71DF6180E26E600808F54 / * CCNodeLoader . h in Headers * / , <nl> 50ABBD861925AB4100A911A9 / * CCBatchCommand . h in Headers * / , <nl> 1AD71DFA180E26E600808F54 / * CCNodeLoaderLibrary . h in Headers * / , <nl> 50ABBE481925AB6F00A911A9 / * CCEvent . h in Headers * / , <nl> 5027253B190BF1B900AAF4ED / * cocos2d . h in Headers * / , <nl> + B29594CD1926D61F003EEF37 / * CCSprite3D . h in Headers * / , <nl> 1AD71DFC180E26E600808F54 / * CCNodeLoaderListener . h in Headers * / , <nl> 3EA0FB6B191C841D00B170C8 / * UIVideoPlayer . h in Headers * / , <nl> 50ABBE641925AB6F00A911A9 / * CCEventListenerAcceleration . h in Headers * / , <nl> <nl> 1AD71E0C180E26E600808F54 / * CCSpriteLoader . h in Headers * / , <nl> 50ABBD921925AB4100A911A9 / * CCGLProgramCache . h in Headers * / , <nl> 1AD71E0E180E26E600808F54 / * CocosBuilder . h in Headers * / , <nl> + B29594C91926D61F003EEF37 / * CCObjLoader . h in Headers * / , <nl> 1AD71E98180E26E600808F54 / * Animation . h in Headers * / , <nl> 1AD71E9C180E26E600808F54 / * AnimationState . h in Headers * / , <nl> 50ABBE961925AB6F00A911A9 / * CCProfiling . h in Headers * / , <nl> <nl> 50FCEBBF18C72017004AD434 / * TextFieldReader . cpp in Sources * / , <nl> 50FCEBAF18C72017004AD434 / * ScrollViewReader . cpp in Sources * / , <nl> 50ABC0111926664800A911A9 / * CCGLViewProtocol . cpp in Sources * / , <nl> + B29594C21926D61F003EEF37 / * CCMesh . cpp in Sources * / , <nl> 50ABBE3D1925AB6F00A911A9 / * CCDataVisitor . cpp in Sources * / , <nl> 1A5702C8180BCE370088DEC7 / * CCTextFieldTTF . cpp in Sources * / , <nl> 50ABBE7D1925AB6F00A911A9 / * CCEventTouch . cpp in Sources * / , <nl> <nl> 1AD71DE9180E26E600808F54 / * CCMenuItemLoader . cpp in Sources * / , <nl> 50ABBDA31925AB4100A911A9 / * CCQuadCommand . cpp in Sources * / , <nl> 2905FA6A18CF08D100240AA3 / * UIPageView . cpp in Sources * / , <nl> + B29594C61926D61F003EEF37 / * CCObjLoader . cpp in Sources * / , <nl> 06CAAAC7186AD7E90012A414 / * TriggerObj . cpp in Sources * / , <nl> 1AD71DEF180E26E600808F54 / * CCNode + CCBRelativePositioning . cpp in Sources * / , <nl> 50ABC01D1926664800A911A9 / * CCThread . cpp in Sources * / , <nl> <nl> 1AD71ECD180E26E600808F54 / * Skeleton . cpp in Sources * / , <nl> 1AD71ED1180E26E600808F54 / * SkeletonData . cpp in Sources * / , <nl> 1AD71ED5180E26E600808F54 / * SkeletonJson . cpp in Sources * / , <nl> + B29594CA1926D61F003EEF37 / * CCSprite3D . cpp in Sources * / , <nl> 1AD71ED9180E26E600808F54 / * Skin . cpp in Sources * / , <nl> 1AD71EDD180E26E600808F54 / * Slot . cpp in Sources * / , <nl> 1AD71EE1180E26E600808F54 / * SlotData . cpp in Sources * / , <nl> <nl> 1A8C59C3180E930E00EF57C3 / * CCComController . cpp in Sources * / , <nl> 2905FA5218CF08D100240AA3 / * UIImageView . cpp in Sources * / , <nl> 50ABBDBD1925AB4100A911A9 / * CCTextureCache . cpp in Sources * / , <nl> + B29594CE1926D61F003EEF37 / * CCSprite3DDataCache . cpp in Sources * / , <nl> 2905FA7C18CF08D100240AA3 / * UIText . cpp in Sources * / , <nl> 50FCEB9F18C72017004AD434 / * LayoutReader . cpp in Sources * / , <nl> 50ABC0211926664800A911A9 / * CCGLView . cpp in Sources * / , <nl> <nl> 1A8C59EF180E930E00EF57C3 / * CCSpriteFrameCacheHelper . cpp in Sources * / , <nl> 1A8C59F3180E930E00EF57C3 / * CCSSceneReader . cpp in Sources * / , <nl> 2905FA6E18CF08D100240AA3 / * UIRichText . cpp in Sources * / , <nl> + B29594B41926D5EC003EEF37 / * CCMeshCommand . cpp in Sources * / , <nl> 1A01C68E18F57BE800EFE3A6 / * CCDictionary . cpp in Sources * / , <nl> 1A8C59F7180E930E00EF57C3 / * CCTransformHelp . cpp in Sources * / , <nl> 50ABBD381925AB0000A911A9 / * CCAffineTransform . cpp in Sources * / , <nl> <nl> 50ABBE621925AB6F00A911A9 / * CCEventListenerAcceleration . cpp in Sources * / , <nl> B37510811823ACA100B3BA6A / * CCPhysicsJointInfo_chipmunk . cpp in Sources * / , <nl> 2905FA8D18CF08D100240AA3 / * UIWidget . cpp in Sources * / , <nl> + B29594B51926D5EC003EEF37 / * CCMeshCommand . cpp in Sources * / , <nl> 50ABBE7E1925AB6F00A911A9 / * CCEventTouch . cpp in Sources * / , <nl> 50FCEB9818C72017004AD434 / * CheckBoxReader . cpp in Sources * / , <nl> 50ABBE6E1925AB6F00A911A9 / * CCEventListenerKeyboard . cpp in Sources * / , <nl> <nl> 1A570082180BC5A10088DEC7 / * CCActionManager . cpp in Sources * / , <nl> 1A570086180BC5A10088DEC7 / * CCActionPageTurn3D . cpp in Sources * / , <nl> 1A57008A180BC5A10088DEC7 / * CCActionProgressTimer . cpp in Sources * / , <nl> + B29594CB1926D61F003EEF37 / * CCSprite3D . cpp in Sources * / , <nl> 2905FA6F18CF08D100240AA3 / * UIRichText . cpp in Sources * / , <nl> 50ABBED81925AB6F00A911A9 / * ZipUtils . cpp in Sources * / , <nl> 1A57008E180BC5A10088DEC7 / * CCActionTiledGrid . cpp in Sources * / , <nl> <nl> 50ABBE3E1925AB6F00A911A9 / * CCDataVisitor . cpp in Sources * / , <nl> 1A57009F180BC5D20088DEC7 / * CCNode . cpp in Sources * / , <nl> B37510831823ACA100B3BA6A / * CCPhysicsShapeInfo_chipmunk . cpp in Sources * / , <nl> + B29594CF1926D61F003EEF37 / * CCSprite3DDataCache . cpp in Sources * / , <nl> 1A57010F180BC8EE0088DEC7 / * CCDrawingPrimitives . cpp in Sources * / , <nl> 1A570113180BC8EE0088DEC7 / * CCDrawNode . cpp in Sources * / , <nl> 1A57011C180BC90D0088DEC7 / * CCGrabber . cpp in Sources * / , <nl> <nl> 1AD71DDA180E26E600808F54 / * CCLayerColorLoader . cpp in Sources * / , <nl> 50FCEBC018C72017004AD434 / * TextFieldReader . cpp in Sources * / , <nl> 1AD71DDE180E26E600808F54 / * CCLayerGradientLoader . cpp in Sources * / , <nl> + B29594C31926D61F003EEF37 / * CCMesh . cpp in Sources * / , <nl> 1AD71DE2180E26E600808F54 / * CCLayerLoader . cpp in Sources * / , <nl> 1AD71DE6180E26E600808F54 / * CCMenuItemImageLoader . cpp in Sources * / , <nl> 50ABBEA81925AB6F00A911A9 / * CCTouch . cpp in Sources * / , <nl> <nl> 1AD71EB2180E26E600808F54 / * Bone . cpp in Sources * / , <nl> 50ABBD451925AB0000A911A9 / * CCVertex . cpp in Sources * / , <nl> 2905FA8118CF08D100240AA3 / * UITextAtlas . cpp in Sources * / , <nl> + B29594C71926D61F003EEF37 / * CCObjLoader . cpp in Sources * / , <nl> 50ABBEB01925AB6F00A911A9 / * CCUserDefault . cpp in Sources * / , <nl> 50FCEBB818C72017004AD434 / * TextAtlasReader . cpp in Sources * / , <nl> 1AD71EB6180E26E600808F54 / * BoneData . cpp in Sources * / , <nl> mmm a / build / cocos2d_tests . xcodeproj / project . pbxproj <nl> ppp b / build / cocos2d_tests . xcodeproj / project . pbxproj <nl> <nl> 29080DE4191B595E0066F8DF / * UIWidgetAddNodeTest . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = 29080D89191B595E0066F8DF / * UIWidgetAddNodeTest . cpp * / ; } ; <nl> 29080DE5191B595E0066F8DF / * UIWidgetAddNodeTest_Editor . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = 29080D8B191B595E0066F8DF / * UIWidgetAddNodeTest_Editor . cpp * / ; } ; <nl> 29080DE6191B595E0066F8DF / * UIWidgetAddNodeTest_Editor . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = 29080D8B191B595E0066F8DF / * UIWidgetAddNodeTest_Editor . cpp * / ; } ; <nl> + 3E92EA821921A1400094CD21 / * Sprite3DTest . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = 3E92EA801921A1400094CD21 / * Sprite3DTest . cpp * / ; } ; <nl> + 3E92EA831921A1400094CD21 / * Sprite3DTest . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = 3E92EA801921A1400094CD21 / * Sprite3DTest . cpp * / ; } ; <nl> + 3E92EA851921A7720094CD21 / * Sprite3DTest in Resources * / = { isa = PBXBuildFile ; fileRef = 3E92EA841921A7720094CD21 / * Sprite3DTest * / ; } ; <nl> + 3E92EA861921A7720094CD21 / * Sprite3DTest in Resources * / = { isa = PBXBuildFile ; fileRef = 3E92EA841921A7720094CD21 / * Sprite3DTest * / ; } ; <nl> 3EA0FB5E191B92F100B170C8 / * cocosvideo . mp4 in Resources * / = { isa = PBXBuildFile ; fileRef = 3EA0FB5D191B92F100B170C8 / * cocosvideo . mp4 * / ; } ; <nl> 3EA0FB66191B933000B170C8 / * MediaPlayer . framework in Frameworks * / = { isa = PBXBuildFile ; fileRef = 3EA0FB65191B933000B170C8 / * MediaPlayer . framework * / ; } ; <nl> 3EA0FB72191C844400B170C8 / * UIVideoPlayerTest . cpp in Sources * / = { isa = PBXBuildFile ; fileRef = 3EA0FB70191C844400B170C8 / * UIVideoPlayerTest . cpp * / ; } ; <nl> <nl> A07A52BF1783AF210073F6A7 / * OpenGLES . framework in Frameworks * / = { isa = PBXBuildFile ; fileRef = A07A52B91783AE900073F6A7 / * OpenGLES . framework * / ; } ; <nl> A07A52C01783AF250073F6A7 / * UIKit . framework in Frameworks * / = { isa = PBXBuildFile ; fileRef = A07A52B71783AE6D0073F6A7 / * UIKit . framework * / ; } ; <nl> A07A52C31783B02C0073F6A7 / * AVFoundation . framework in Frameworks * / = { isa = PBXBuildFile ; fileRef = A07A52C11783B01F0073F6A7 / * AVFoundation . framework * / ; } ; <nl> + B2507B6B192589AF00FA4972 / * Shaders3D in Resources * / = { isa = PBXBuildFile ; fileRef = B2507B6A192589AF00FA4972 / * Shaders3D * / ; } ; <nl> + B2507B6C192589AF00FA4972 / * Shaders3D in Resources * / = { isa = PBXBuildFile ; fileRef = B2507B6A192589AF00FA4972 / * Shaders3D * / ; } ; <nl> C08689C118D370C90093E810 / * background . caf in Resources * / = { isa = PBXBuildFile ; fileRef = C08689C018D370C90093E810 / * background . caf * / ; } ; <nl> C08689C218D370C90093E810 / * background . caf in Resources * / = { isa = PBXBuildFile ; fileRef = C08689C018D370C90093E810 / * background . caf * / ; } ; <nl> C08689C318D370C90093E810 / * background . caf in Resources * / = { isa = PBXBuildFile ; fileRef = C08689C018D370C90093E810 / * background . caf * / ; } ; <nl> <nl> 29080D8A191B595E0066F8DF / * UIWidgetAddNodeTest . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = UIWidgetAddNodeTest . h ; sourceTree = " < group > " ; } ; <nl> 29080D8B191B595E0066F8DF / * UIWidgetAddNodeTest_Editor . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = UIWidgetAddNodeTest_Editor . cpp ; sourceTree = " < group > " ; } ; <nl> 29080D8C191B595E0066F8DF / * UIWidgetAddNodeTest_Editor . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; path = UIWidgetAddNodeTest_Editor . h ; sourceTree = " < group > " ; } ; <nl> + 3E92EA801921A1400094CD21 / * Sprite3DTest . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; name = Sprite3DTest . cpp ; path = Sprite3DTest / Sprite3DTest . cpp ; sourceTree = " < group > " ; } ; <nl> + 3E92EA811921A1400094CD21 / * Sprite3DTest . h * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . c . h ; name = Sprite3DTest . h ; path = Sprite3DTest / Sprite3DTest . h ; sourceTree = " < group > " ; } ; <nl> + 3E92EA841921A7720094CD21 / * Sprite3DTest * / = { isa = PBXFileReference ; lastKnownFileType = folder ; name = Sprite3DTest ; path = " . . / tests / cpp - tests / Resources / Sprite3DTest " ; sourceTree = " < group > " ; } ; <nl> 3EA0FB5D191B92F100B170C8 / * cocosvideo . mp4 * / = { isa = PBXFileReference ; lastKnownFileType = file ; name = cocosvideo . mp4 ; path = " . . / tests / cpp - tests / Resources / cocosvideo . mp4 " ; sourceTree = " < group > " ; } ; <nl> 3EA0FB65191B933000B170C8 / * MediaPlayer . framework * / = { isa = PBXFileReference ; lastKnownFileType = wrapper . framework ; name = MediaPlayer . framework ; path = Platforms / iPhoneOS . platform / Developer / SDKs / iPhoneOS7 . 1 . sdk / System / Library / Frameworks / MediaPlayer . framework ; sourceTree = DEVELOPER_DIR ; } ; <nl> 3EA0FB70191C844400B170C8 / * UIVideoPlayerTest . cpp * / = { isa = PBXFileReference ; fileEncoding = 4 ; lastKnownFileType = sourcecode . cpp . cpp ; path = UIVideoPlayerTest . cpp ; sourceTree = " < group > " ; } ; <nl> <nl> A07A52B91783AE900073F6A7 / * OpenGLES . framework * / = { isa = PBXFileReference ; lastKnownFileType = wrapper . framework ; name = OpenGLES . framework ; path = Platforms / iPhoneOS . platform / Developer / SDKs / iPhoneOS6 . 1 . sdk / System / Library / Frameworks / OpenGLES . framework ; sourceTree = DEVELOPER_DIR ; } ; <nl> A07A52BB1783AEB80073F6A7 / * CoreGraphics . framework * / = { isa = PBXFileReference ; lastKnownFileType = wrapper . framework ; name = CoreGraphics . framework ; path = Platforms / iPhoneOS . platform / Developer / SDKs / iPhoneOS6 . 1 . sdk / System / Library / Frameworks / CoreGraphics . framework ; sourceTree = DEVELOPER_DIR ; } ; <nl> A07A52C11783B01F0073F6A7 / * AVFoundation . framework * / = { isa = PBXFileReference ; lastKnownFileType = wrapper . framework ; name = AVFoundation . framework ; path = Platforms / iPhoneOS . platform / Developer / SDKs / iPhoneOS6 . 1 . sdk / System / Library / Frameworks / AVFoundation . framework ; sourceTree = DEVELOPER_DIR ; } ; <nl> + B2507B6A192589AF00FA4972 / * Shaders3D * / = { isa = PBXFileReference ; lastKnownFileType = folder ; name = Shaders3D ; path = " . . / tests / cpp - tests / Resources / Shaders3D " ; sourceTree = " < group > " ; } ; <nl> C08689C018D370C90093E810 / * background . caf * / = { isa = PBXFileReference ; lastKnownFileType = file ; name = background . caf ; path = " . . / tests / cpp - tests / Resources / background . caf " ; sourceTree = " < group > " ; } ; <nl> D60AE43317F7FFE100757E4B / * CoreMotion . framework * / = { isa = PBXFileReference ; lastKnownFileType = wrapper . framework ; name = CoreMotion . framework ; path = Platforms / iPhoneOS . platform / Developer / SDKs / iPhoneOS7 . 0 . sdk / System / Library / Frameworks / CoreMotion . framework ; sourceTree = DEVELOPER_DIR ; } ; <nl> EDCC747E17C455FD007B692C / * IOKit . framework * / = { isa = PBXFileReference ; lastKnownFileType = wrapper . framework ; name = IOKit . framework ; path = System / Library / Frameworks / IOKit . framework ; sourceTree = SDKROOT ; } ; <nl> <nl> 1AC35AE918CECF0C00F37B72 / * SchedulerTest * / , <nl> 1AC35AEC18CECF0C00F37B72 / * ShaderTest * / , <nl> 1AC35AF118CECF0C00F37B72 / * SpineTest * / , <nl> + 3E92EA7D1921A0C60094CD21 / * Sprite3DTest * / , <nl> 1AC35AF418CECF0C00F37B72 / * SpriteTest * / , <nl> 1AC35AF718CECF0C00F37B72 / * testBasic . cpp * / , <nl> 1AC35AF818CECF0C00F37B72 / * testBasic . h * / , <nl> <nl> 1AC35CA818CED83500F37B72 / * Resources * / = { <nl> isa = PBXGroup ; <nl> children = ( <nl> + B2507B6A192589AF00FA4972 / * Shaders3D * / , <nl> + 3E92EA841921A7720094CD21 / * Sprite3DTest * / , <nl> 3EA0FB5D191B92F100B170C8 / * cocosvideo . mp4 * / , <nl> 1AC35CA918CED84500F37B72 / * animations * / , <nl> 1AC35CAE18CED84500F37B72 / * ccb * / , <nl> <nl> name = Frameworks ; <nl> sourceTree = " < group > " ; <nl> } ; <nl> + 3E92EA7D1921A0C60094CD21 / * Sprite3DTest * / = { <nl> + isa = PBXGroup ; <nl> + children = ( <nl> + 3E92EA801921A1400094CD21 / * Sprite3DTest . cpp * / , <nl> + 3E92EA811921A1400094CD21 / * Sprite3DTest . h * / , <nl> + ) ; <nl> + name = Sprite3DTest ; <nl> + sourceTree = " < group > " ; <nl> + } ; <nl> 3EA0FB6F191C844400B170C8 / * UIVideoPlayerTest * / = { <nl> isa = PBXGroup ; <nl> children = ( <nl> <nl> 1AC35D0418CED84500F37B72 / * Shaders in Resources * / , <nl> 1AC35CD818CED84500F37B72 / * CocosBuilderExample . ccbresourcelog in Resources * / , <nl> 1AC35CDC18CED84500F37B72 / * commonly_used_words . txt in Resources * / , <nl> + B2507B6B192589AF00FA4972 / * Shaders3D in Resources * / , <nl> 1AC35D0618CED84500F37B72 / * spine in Resources * / , <nl> 1AC35CE818CED84500F37B72 / * extensions in Resources * / , <nl> 1AC35CDE18CED84500F37B72 / * components in Resources * / , <nl> <nl> 1AC35D0018CED84500F37B72 / * pew - pew - lei . wav in Resources * / , <nl> 1AC35CD018CED84500F37B72 / * background . mp3 in Resources * / , <nl> 1AC35CD618CED84500F37B72 / * CocosBuilderExample . ccbproj in Resources * / , <nl> + 3E92EA851921A7720094CD21 / * Sprite3DTest in Resources * / , <nl> 1AC35CA318CECF1E00F37B72 / * InfoPlist . strings in Resources * / , <nl> 1AC35CA418CECF1E00F37B72 / * MainMenu . xib in Resources * / , <nl> 1AC35CD418CED84500F37B72 / * ccb in Resources * / , <nl> <nl> 1AC35CD318CED84500F37B72 / * background . ogg in Resources * / , <nl> 1AC35CCB18CED84500F37B72 / * animations in Resources * / , <nl> 3EA0FB5E191B92F100B170C8 / * cocosvideo . mp4 in Resources * / , <nl> + 3E92EA861921A7720094CD21 / * Sprite3DTest in Resources * / , <nl> 1AC35C8C18CECF1400F37B72 / * Icon - 114 . png in Resources * / , <nl> 1AC35CF118CED84500F37B72 / * hd in Resources * / , <nl> 1AC35C9318CECF1400F37B72 / * Icon - 57 . png in Resources * / , <nl> <nl> 1AC35C9418CECF1400F37B72 / * Icon - 58 . png in Resources * / , <nl> 1AC35CD118CED84500F37B72 / * background . mp3 in Resources * / , <nl> 1AC35CD918CED84500F37B72 / * CocosBuilderExample . ccbresourcelog in Resources * / , <nl> + B2507B6C192589AF00FA4972 / * Shaders3D in Resources * / , <nl> 1AC35CED18CED84500F37B72 / * fonts in Resources * / , <nl> 1AC35CD718CED84500F37B72 / * CocosBuilderExample . ccbproj in Resources * / , <nl> 1AC35CDD18CED84500F37B72 / * commonly_used_words . txt in Resources * / , <nl> <nl> 1AC35BE118CECF0C00F37B72 / * CCControlButtonTest . cpp in Sources * / , <nl> 1AC35BEB18CECF0C00F37B72 / * CCControlSliderTest . cpp in Sources * / , <nl> 1AC35C4D18CECF0C00F37B72 / * SpineTest . cpp in Sources * / , <nl> + 3E92EA821921A1400094CD21 / * Sprite3DTest . cpp in Sources * / , <nl> 1AC35C1D18CECF0C00F37B72 / * NewRendererTest . cpp in Sources * / , <nl> 1AC35B6718CECF0C00F37B72 / * AnimationsTestLayer . cpp in Sources * / , <nl> 29080DB7191B595E0066F8DF / * UIListViewTest_Editor . cpp in Sources * / , <nl> <nl> 1AC35B5418CECF0C00F37B72 / * CocosDenshionTest . cpp in Sources * / , <nl> 1AC35B8018CECF0C00F37B72 / * ProjectileController . cpp in Sources * / , <nl> 1AC35C2618CECF0C00F37B72 / * PerformanceAllocTest . cpp in Sources * / , <nl> + 3E92EA831921A1400094CD21 / * Sprite3DTest . cpp in Sources * / , <nl> 1AC35B5A18CECF0C00F37B72 / * controller . cpp in Sources * / , <nl> 1AC35C2A18CECF0C00F37B72 / * PerformanceEventDispatcherTest . cpp in Sources * / , <nl> 1AC35BEA18CECF0C00F37B72 / * CCControlSceneManager . cpp in Sources * / , <nl> mmm a / cocos / 2d / cocos2d . vcxproj <nl> ppp b / cocos / 2d / cocos2d . vcxproj <nl> xcopy / Y / Q " $ ( ProjectDir ) . . \ . . \ external \ win32 - specific \ gles \ prebuilt \ * . * " " $ ( Ou <nl> < ClCompile Include = " . . \ . . \ external \ unzip \ ioapi . cpp " / > <nl> < ClCompile Include = " . . \ . . \ external \ unzip \ unzip . cpp " / > <nl> < ClCompile Include = " . . \ . . \ external \ xxhash \ xxhash . c " / > <nl> + < ClCompile Include = " . . \ 3d \ CCMesh . cpp " / > <nl> + < ClCompile Include = " . . \ 3d \ CCObjLoader . cpp " / > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3D . cpp " / > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3DDataCache . cpp " / > <nl> < ClCompile Include = " . . \ base \ atitc . cpp " / > <nl> < ClCompile Include = " . . \ base \ base64 . cpp " / > <nl> < ClCompile Include = " . . \ base \ CCAutoreleasePool . cpp " / > <nl> xcopy / Y / Q " $ ( ProjectDir ) . . \ . . \ external \ win32 - specific \ gles \ prebuilt \ * . * " " $ ( Ou <nl> < ClCompile Include = " . . \ renderer \ CCGLProgramStateCache . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ ccGLStateCache . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCGroupCommand . cpp " / > <nl> + < ClCompile Include = " . . \ renderer \ CCMeshCommand . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCQuadCommand . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCRenderCommand . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCRenderer . cpp " / > <nl> xcopy / Y / Q " $ ( ProjectDir ) . . \ . . \ external \ win32 - specific \ gles \ prebuilt \ * . * " " $ ( Ou <nl> < ClInclude Include = " . . \ . . \ external \ unzip \ ioapi . h " / > <nl> < ClInclude Include = " . . \ . . \ external \ unzip \ unzip . h " / > <nl> < ClInclude Include = " . . \ . . \ external \ xxhash \ xxhash . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCMesh . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCObjLoader . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3D . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3DDataCache . h " / > <nl> < ClInclude Include = " . . \ base \ atitc . h " / > <nl> < ClInclude Include = " . . \ base \ base64 . h " / > <nl> < ClInclude Include = " . . \ base \ CCAutoreleasePool . h " / > <nl> xcopy / Y / Q " $ ( ProjectDir ) . . \ . . \ external \ win32 - specific \ gles \ prebuilt \ * . * " " $ ( Ou <nl> < ClInclude Include = " . . \ renderer \ CCGLProgramStateCache . h " / > <nl> < ClInclude Include = " . . \ renderer \ ccGLStateCache . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCGroupCommand . h " / > <nl> + < ClInclude Include = " . . \ renderer \ CCMeshCommand . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCQuadCommand . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCRenderCommand . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCRenderCommandPool . h " / > <nl> mmm a / cocos / 2d / cocos2d . vcxproj . filters <nl> ppp b / cocos / 2d / cocos2d . vcxproj . filters <nl> <nl> < Filter Include = " external \ xxhash " > <nl> < UniqueIdentifier > { b4e2b1e5 - 2d79 - 44a3 - af45 - 728d47b7bdb2 } < / UniqueIdentifier > <nl> < / Filter > <nl> + < Filter Include = " 3d " > <nl> + < UniqueIdentifier > { a20c4bdc - bd4c - 40c1 - a78a - fe31cd3ec76a } < / UniqueIdentifier > <nl> + < / Filter > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClCompile Include = " . . \ physics \ CCPhysicsBody . cpp " > <nl> <nl> < ClCompile Include = " . . \ base \ CCIMEDispatcher . cpp " > <nl> < Filter > base < / Filter > <nl> < / ClCompile > <nl> + < ClCompile Include = " . . \ renderer \ CCMeshCommand . cpp " > <nl> + < Filter > renderer < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCMesh . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCObjLoader . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3D . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3DDataCache . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClInclude Include = " . . \ physics \ CCPhysicsBody . h " > <nl> <nl> < ClInclude Include = " . . \ base \ CCIMEDispatcher . h " > <nl> < Filter > base < / Filter > <nl> < / ClInclude > <nl> + < ClInclude Include = " . . \ renderer \ CCMeshCommand . h " > <nl> + < Filter > renderer < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCMesh . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCObjLoader . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3D . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3DDataCache . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < None Include = " . . \ math \ Mat4 . inl " > <nl> mmm a / cocos / 2d / cocos2d_wp8 . vcxproj <nl> ppp b / cocos / 2d / cocos2d_wp8 . vcxproj <nl> <nl> < PrecompiledHeader Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Debug | ARM ' " > NotUsing < / PrecompiledHeader > <nl> < PrecompiledHeader Condition = " ' $ ( Configuration ) | $ ( Platform ) ' = = ' Release | ARM ' " > NotUsing < / PrecompiledHeader > <nl> < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCMesh . cpp " / > <nl> + < ClCompile Include = " . . \ 3d \ CCObjLoader . cpp " / > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3D . cpp " / > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3DDataCache . cpp " / > <nl> < ClCompile Include = " . . \ base \ atitc . cpp " / > <nl> < ClCompile Include = " . . \ base \ base64 . cpp " / > <nl> < ClCompile Include = " . . \ base \ CCAutoreleasePool . cpp " / > <nl> <nl> < ClCompile Include = " . . \ renderer \ CCGLProgramStateCache . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ ccGLStateCache . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCGroupCommand . cpp " / > <nl> + < ClCompile Include = " . . \ renderer \ CCMeshCommand . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCQuadCommand . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCRenderCommand . cpp " / > <nl> < ClCompile Include = " . . \ renderer \ CCRenderer . cpp " / > <nl> <nl> < ClInclude Include = " . . \ . . \ external \ unzip \ ioapi . h " / > <nl> < ClInclude Include = " . . \ . . \ external \ unzip \ unzip . h " / > <nl> < ClInclude Include = " . . \ . . \ external \ xxhash \ xxhash . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCMesh . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCObjLoader . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3D . h " / > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3DDataCache . h " / > <nl> < ClInclude Include = " . . \ base \ atitc . h " / > <nl> < ClInclude Include = " . . \ base \ base64 . h " / > <nl> < ClInclude Include = " . . \ base \ CCAutoreleasePool . h " / > <nl> <nl> < ClInclude Include = " . . \ renderer \ CCGLProgramStateCache . h " / > <nl> < ClInclude Include = " . . \ renderer \ ccGLStateCache . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCGroupCommand . h " / > <nl> + < ClInclude Include = " . . \ renderer \ CCMeshCommand . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCQuadCommand . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCRenderCommand . h " / > <nl> < ClInclude Include = " . . \ renderer \ CCRenderCommandPool . h " / > <nl> mmm a / cocos / 2d / cocos2d_wp8 . vcxproj . filters <nl> ppp b / cocos / 2d / cocos2d_wp8 . vcxproj . filters <nl> <nl> < ClCompile Include = " . . \ base \ CCIMEDispatcher . cpp " > <nl> < Filter > base < / Filter > <nl> < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCMesh . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCObjLoader . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3D . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ 3d \ CCSprite3DDataCache . cpp " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClCompile > <nl> + < ClCompile Include = " . . \ renderer \ CCMeshCommand . cpp " > <nl> + < Filter > renderer < / Filter > <nl> + < / ClCompile > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClInclude Include = " . . \ physics \ CCPhysicsBody . h " > <nl> <nl> < ClInclude Include = " . . \ base \ CCIMEDispatcher . h " > <nl> < Filter > base < / Filter > <nl> < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCMesh . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCObjLoader . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3D . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ 3d \ CCSprite3DDataCache . h " > <nl> + < Filter > 3d < / Filter > <nl> + < / ClInclude > <nl> + < ClInclude Include = " . . \ renderer \ CCMeshCommand . h " > <nl> + < Filter > renderer < / Filter > <nl> + < / ClInclude > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < None Include = " . . \ math \ Mat4 . inl " > <nl> new file mode 100644 <nl> index 000000000000 . . d7b61e22d1c5 <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCMesh . cpp <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # include " CCMesh . h " <nl> + <nl> + # include < list > <nl> + # include < fstream > <nl> + # include < iostream > <nl> + # include < sstream > <nl> + <nl> + # include " base / ccMacros . h " <nl> + # include " renderer / ccGLStateCache . h " <nl> + # include " CCObjLoader . h " <nl> + # include " CCSprite3DDataCache . h " <nl> + <nl> + using namespace std ; <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + bool RenderMeshData : : hasVertexAttrib ( int attrib ) <nl> + { <nl> + for ( auto itr = _vertexAttribs . begin ( ) ; itr ! = _vertexAttribs . end ( ) ; itr + + ) <nl> + { <nl> + if ( ( * itr ) . vertexAttrib = = attrib ) <nl> + return true ; / / already has <nl> + } <nl> + return false ; <nl> + } <nl> + <nl> + bool RenderMeshData : : initFrom ( const std : : vector < float > & positions , <nl> + const std : : vector < float > & normals , <nl> + const std : : vector < float > & texs , <nl> + const std : : vector < unsigned short > & indices ) <nl> + { <nl> + CC_ASSERT ( positions . size ( ) < 65536 * 3 & & " index may out of bound " ) ; <nl> + <nl> + _vertexAttribs . clear ( ) ; <nl> + _vertexsizeBytes = 0 ; <nl> + <nl> + _vertexNum = positions . size ( ) / 3 ; / / number of vertex <nl> + if ( _vertexNum = = 0 ) <nl> + return false ; <nl> + <nl> + if ( ( normals . size ( ) ! = 0 & & _vertexNum * 3 ! = normals . size ( ) ) | | ( texs . size ( ) ! = 0 & & _vertexNum * 2 ! = texs . size ( ) ) ) <nl> + return false ; <nl> + <nl> + _vertexsizeBytes + = 3 ; <nl> + MeshVertexAttrib meshvertexattrib ; <nl> + meshvertexattrib . size = 3 ; <nl> + meshvertexattrib . type = GL_FLOAT ; <nl> + meshvertexattrib . attribSizeBytes = meshvertexattrib . size * sizeof ( float ) ; <nl> + meshvertexattrib . vertexAttrib = GLProgram : : VERTEX_ATTRIB_POSITION ; <nl> + _vertexAttribs . push_back ( meshvertexattrib ) ; <nl> + <nl> + / / normal <nl> + if ( normals . size ( ) ) <nl> + { <nl> + / / add normal flag <nl> + _vertexsizeBytes + = 3 ; <nl> + meshvertexattrib . vertexAttrib = GLProgram : : VERTEX_ATTRIB_NORMAL ; <nl> + _vertexAttribs . push_back ( meshvertexattrib ) ; <nl> + } <nl> + / / <nl> + if ( texs . size ( ) ) <nl> + { <nl> + _vertexsizeBytes + = 2 ; <nl> + meshvertexattrib . size = 2 ; <nl> + meshvertexattrib . vertexAttrib = GLProgram : : VERTEX_ATTRIB_TEX_COORD ; <nl> + meshvertexattrib . attribSizeBytes = meshvertexattrib . size * sizeof ( float ) ; <nl> + _vertexAttribs . push_back ( meshvertexattrib ) ; <nl> + } <nl> + <nl> + _vertexs . clear ( ) ; <nl> + _vertexs . reserve ( _vertexNum * _vertexsizeBytes ) ; <nl> + _vertexsizeBytes * = sizeof ( float ) ; <nl> + <nl> + bool hasNormal = hasVertexAttrib ( GLProgram : : VERTEX_ATTRIB_NORMAL ) ; <nl> + bool hasTexCoord = hasVertexAttrib ( GLProgram : : VERTEX_ATTRIB_TEX_COORD ) ; <nl> + / / position , normal , texCoordinate into _vertexs <nl> + for ( int i = 0 ; i < _vertexNum ; i + + ) <nl> + { <nl> + _vertexs . push_back ( positions [ i * 3 ] ) ; <nl> + _vertexs . push_back ( positions [ i * 3 + 1 ] ) ; <nl> + _vertexs . push_back ( positions [ i * 3 + 2 ] ) ; <nl> + <nl> + if ( hasNormal ) <nl> + { <nl> + _vertexs . push_back ( normals [ i * 3 ] ) ; <nl> + _vertexs . push_back ( normals [ i * 3 + 1 ] ) ; <nl> + _vertexs . push_back ( normals [ i * 3 + 2 ] ) ; <nl> + } <nl> + <nl> + if ( hasTexCoord ) <nl> + { <nl> + _vertexs . push_back ( texs [ i * 2 ] ) ; <nl> + _vertexs . push_back ( texs [ i * 2 + 1 ] ) ; <nl> + } <nl> + } <nl> + _indices = indices ; <nl> + <nl> + return true ; <nl> + } <nl> + <nl> + Mesh : : Mesh ( ) <nl> + : _vertexBuffer ( 0 ) <nl> + , _indexBuffer ( 0 ) <nl> + , _primitiveType ( PrimitiveType : : TRIANGLES ) <nl> + , _indexFormat ( IndexFormat : : INDEX16 ) <nl> + , _indexCount ( 0 ) <nl> + { <nl> + } <nl> + <nl> + Mesh : : ~ Mesh ( ) <nl> + { <nl> + cleanAndFreeBuffers ( ) ; <nl> + } <nl> + <nl> + Mesh * Mesh : : create ( const std : : vector < float > & positions , const std : : vector < float > & normals , const std : : vector < float > & texs , const std : : vector < unsigned short > & indices ) <nl> + { <nl> + auto mesh = new Mesh ( ) ; <nl> + if ( mesh & & mesh - > init ( positions , normals , texs , indices ) ) <nl> + { <nl> + mesh - > autorelease ( ) ; <nl> + return mesh ; <nl> + } <nl> + CC_SAFE_DELETE ( mesh ) ; <nl> + return nullptr ; <nl> + } <nl> + <nl> + bool Mesh : : init ( const std : : vector < float > & positions , const std : : vector < float > & normals , const std : : vector < float > & texs , const std : : vector < unsigned short > & indices ) <nl> + { <nl> + bool bRet = _renderdata . initFrom ( positions , normals , texs , indices ) ; <nl> + if ( ! bRet ) <nl> + return false ; <nl> + <nl> + restore ( ) ; <nl> + return true ; <nl> + } <nl> + <nl> + void Mesh : : cleanAndFreeBuffers ( ) <nl> + { <nl> + if ( glIsBuffer ( _vertexBuffer ) ) <nl> + { <nl> + glDeleteBuffers ( 1 , & _vertexBuffer ) ; <nl> + _vertexBuffer = 0 ; <nl> + } <nl> + <nl> + if ( glIsBuffer ( _indexBuffer ) ) <nl> + { <nl> + glDeleteBuffers ( 1 , & _indexBuffer ) ; <nl> + _indexBuffer = 0 ; <nl> + } <nl> + _primitiveType = PrimitiveType : : TRIANGLES ; <nl> + _indexFormat = IndexFormat : : INDEX16 ; <nl> + _indexCount = 0 ; <nl> + } <nl> + <nl> + void Mesh : : buildBuffer ( ) <nl> + { <nl> + cleanAndFreeBuffers ( ) ; <nl> + <nl> + glGenBuffers ( 1 , & _vertexBuffer ) ; <nl> + glBindBuffer ( GL_ARRAY_BUFFER , _vertexBuffer ) ; <nl> + <nl> + glBufferData ( GL_ARRAY_BUFFER , <nl> + _renderdata . _vertexs . size ( ) * sizeof ( _renderdata . _vertexs [ 0 ] ) , <nl> + & _renderdata . _vertexs [ 0 ] , <nl> + GL_STATIC_DRAW ) ; <nl> + glBindBuffer ( GL_ARRAY_BUFFER , 0 ) ; <nl> + <nl> + glGenBuffers ( 1 , & _indexBuffer ) ; <nl> + <nl> + glBindBuffer ( GL_ELEMENT_ARRAY_BUFFER , _indexBuffer ) ; <nl> + <nl> + unsigned int indexSize = 2 ; <nl> + IndexFormat indexformat = IndexFormat : : INDEX16 ; <nl> + <nl> + glBufferData ( GL_ELEMENT_ARRAY_BUFFER , indexSize * _renderdata . _indices . size ( ) , & _renderdata . _indices [ 0 ] , GL_STATIC_DRAW ) ; <nl> + <nl> + glBindBuffer ( GL_ELEMENT_ARRAY_BUFFER , 0 ) ; <nl> + <nl> + _primitiveType = PrimitiveType : : TRIANGLES ; <nl> + _indexFormat = indexformat ; <nl> + _indexCount = _renderdata . _indices . size ( ) ; <nl> + } <nl> + <nl> + void Mesh : : restore ( ) <nl> + { <nl> + cleanAndFreeBuffers ( ) ; <nl> + buildBuffer ( ) ; <nl> + } <nl> + <nl> + NS_CC_END <nl> new file mode 100644 <nl> index 000000000000 . . 1d0db6778510 <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCMesh . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # ifndef __CCMESH_H__ <nl> + # define __CCMESH_H__ <nl> + <nl> + # include < string > <nl> + # include < vector > <nl> + <nl> + # include " base / CCRef . h " <nl> + # include " base / ccTypes . h " <nl> + # include " math / CCMath . h " <nl> + # include " renderer / CCGLProgram . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + / / mesh vertex attribute <nl> + struct MeshVertexAttrib <nl> + { <nl> + / / attribute size <nl> + GLint size ; <nl> + / / GL_FLOAT <nl> + GLenum type ; <nl> + / / VERTEX_ATTRIB_POSITION , VERTEX_ATTRIB_COLOR , VERTEX_ATTRIB_TEX_COORD , VERTEX_ATTRIB_NORMAL , GLProgram for detail <nl> + int vertexAttrib ; <nl> + / / size in bytes <nl> + int attribSizeBytes ; <nl> + } ; <nl> + <nl> + class RenderMeshData <nl> + { <nl> + friend class Mesh ; <nl> + public : <nl> + RenderMeshData ( ) : _vertexsizeBytes ( 0 ) <nl> + { <nl> + } <nl> + bool hasVertexAttrib ( int attrib ) ; <nl> + bool initFrom ( const std : : vector < float > & positions , const std : : vector < float > & normals , const std : : vector < float > & texs , const std : : vector < unsigned short > & indices ) ; <nl> + <nl> + protected : <nl> + int _vertexsizeBytes ; <nl> + ssize_t _vertexNum ; <nl> + std : : vector < float > _vertexs ; <nl> + std : : vector < unsigned short > _indices ; <nl> + std : : vector < MeshVertexAttrib > _vertexAttribs ; <nl> + } ; <nl> + <nl> + / * * Mesh : TODO , add description of Mesh * / <nl> + class Mesh : public Ref <nl> + { <nl> + public : <nl> + / * * Defines supported index formats . * / <nl> + enum class IndexFormat <nl> + { <nl> + INDEX8 = GL_UNSIGNED_BYTE , <nl> + INDEX16 = GL_UNSIGNED_SHORT , <nl> + } ; <nl> + <nl> + / * * Defines supported primitive types . * / <nl> + enum class PrimitiveType <nl> + { <nl> + TRIANGLES = GL_TRIANGLES , <nl> + TRIANGLE_STRIP = GL_TRIANGLE_STRIP , <nl> + LINES = GL_LINES , <nl> + LINE_STRIP = GL_LINE_STRIP , <nl> + POINTS = GL_POINTS <nl> + } ; <nl> + <nl> + / / create <nl> + static Mesh * create ( const std : : vector < float > & positions , const std : : vector < float > & normals , const std : : vector < float > & texs , const std : : vector < unsigned short > & indices ) ; <nl> + <nl> + / / get vertex buffer <nl> + inline GLuint getVertexBuffer ( ) const { return _vertexBuffer ; } <nl> + <nl> + / / get mesh vertex attribute count <nl> + ssize_t getMeshVertexAttribCount ( ) const { return _renderdata . _vertexAttribs . size ( ) ; } <nl> + / / get MeshVertexAttribute by index <nl> + const MeshVertexAttrib & getMeshVertexAttribute ( int idx ) const { return _renderdata . _vertexAttribs [ idx ] ; } <nl> + / / has vertex attribute ? <nl> + bool hasVertexAttrib ( int attrib ) { return _renderdata . hasVertexAttrib ( attrib ) ; } <nl> + / / get per vertex size in bytes <nl> + int getVertexSizeInBytes ( ) const { return _renderdata . _vertexsizeBytes ; } <nl> + <nl> + PrimitiveType getPrimitiveType ( ) const { return _primitiveType ; } <nl> + ssize_t getIndexCount ( ) const { return _indexCount ; } <nl> + IndexFormat getIndexFormat ( ) const { return _indexFormat ; } <nl> + GLuint getIndexBuffer ( ) const { return _indexBuffer ; } <nl> + <nl> + / / build vertex buffer from renderdata <nl> + void restore ( ) ; <nl> + <nl> + protected : <nl> + Mesh ( ) ; <nl> + virtual ~ Mesh ( ) ; <nl> + bool init ( const std : : vector < float > & positions , const std : : vector < float > & normals , const std : : vector < float > & texs , const std : : vector < unsigned short > & indices ) ; <nl> + <nl> + / / build buffer <nl> + void buildBuffer ( ) ; <nl> + void cleanAndFreeBuffers ( ) ; <nl> + <nl> + PrimitiveType _primitiveType ; <nl> + IndexFormat _indexFormat ; <nl> + GLuint _vertexBuffer ; <nl> + GLuint _indexBuffer ; <nl> + ssize_t _indexCount ; <nl> + <nl> + RenderMeshData _renderdata ; <nl> + } ; <nl> + <nl> + NS_CC_END <nl> + <nl> + # endif / / __CCMESH_H_ <nl> new file mode 100644 <nl> index 000000000000 . . 939de7798400 <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCObjLoader . cpp <nl> <nl> + / / <nl> + / / Copyright 2012 - 2013 , Syoyo Fujita . <nl> + / / <nl> + / / Licensed under 2 - clause BSD liecense . <nl> + / / <nl> + <nl> + / / <nl> + / / version 0 . 9 . 6 : Support Ni ( index of refraction ) mtl parameter . <nl> + / / Parse transmittance material parameter correctly . <nl> + / / version 0 . 9 . 5 : Parse multiple group name . <nl> + / / Add support of specifying the base path to load material file . <nl> + / / version 0 . 9 . 4 : Initial suupport of group tag ( g ) <nl> + / / version 0 . 9 . 3 : Fix parsing triple ' x / y / z ' <nl> + / / version 0 . 9 . 2 : Add more . mtl load support <nl> + / / version 0 . 9 . 1 : Add initial . mtl load support <nl> + / / version 0 . 9 . 0 : Initial <nl> + / / <nl> + <nl> + # include < cstdlib > <nl> + # include < cstring > <nl> + # include < cassert > <nl> + <nl> + # include < string > <nl> + # include < vector > <nl> + # include < map > <nl> + # include < fstream > <nl> + # include < sstream > <nl> + <nl> + # include " CCObjLoader . h " <nl> + # include " platform / CCFileUtils . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + struct vertex_index <nl> + { <nl> + int v_idx , vt_idx , vn_idx ; <nl> + vertex_index ( ) { } ; <nl> + vertex_index ( int idx ) : v_idx ( idx ) , vt_idx ( idx ) , vn_idx ( idx ) { } ; <nl> + vertex_index ( int vidx , int vtidx , int vnidx ) : v_idx ( vidx ) , vt_idx ( vtidx ) , vn_idx ( vnidx ) { } ; <nl> + <nl> + } ; <nl> + / / for std : : map <nl> + static inline bool operator < ( const vertex_index & a , const vertex_index & b ) <nl> + { <nl> + if ( a . v_idx ! = b . v_idx ) return ( a . v_idx < b . v_idx ) ; <nl> + if ( a . vn_idx ! = b . vn_idx ) return ( a . vn_idx < b . vn_idx ) ; <nl> + if ( a . vt_idx ! = b . vt_idx ) return ( a . vt_idx < b . vt_idx ) ; <nl> + return false ; <nl> + } <nl> + <nl> + struct obj_shape <nl> + { <nl> + std : : vector < float > v ; <nl> + std : : vector < float > vn ; <nl> + std : : vector < float > vt ; <nl> + } ; <nl> + <nl> + static inline bool isSpace ( const char c ) <nl> + { <nl> + return ( c = = ' ' ) | | ( c = = ' \ t ' ) ; <nl> + } <nl> + <nl> + static inline bool isNewLine ( const char c ) <nl> + { <nl> + return ( c = = ' \ r ' ) | | ( c = = ' \ n ' ) | | ( c = = ' \ 0 ' ) ; <nl> + } <nl> + <nl> + / / Make index zero - base , and also support relative index . <nl> + static inline int fixIndex ( int idx , int n ) <nl> + { <nl> + int i ; <nl> + <nl> + if ( idx > 0 ) { <nl> + i = idx - 1 ; <nl> + } else if ( idx = = 0 ) { <nl> + i = 0 ; <nl> + } else { / / negative value = relative <nl> + i = n + idx ; <nl> + } <nl> + return i ; <nl> + } <nl> + <nl> + static inline std : : string parseString ( const char * & token ) <nl> + { <nl> + std : : string s ; <nl> + auto b = strspn ( token , " \ t " ) ; <nl> + auto e = strcspn ( token , " \ t \ r " ) ; <nl> + s = std : : string ( & token [ b ] , & token [ e ] ) ; <nl> + <nl> + token + = ( e - b ) ; <nl> + return s ; <nl> + } <nl> + <nl> + static inline int parseInt ( const char * & token ) <nl> + { <nl> + token + = strspn ( token , " \ t " ) ; <nl> + int i = atoi ( token ) ; <nl> + token + = strcspn ( token , " \ t \ r " ) ; <nl> + return i ; <nl> + } <nl> + <nl> + static inline float parseFloat ( const char * & token ) <nl> + { <nl> + token + = strspn ( token , " \ t " ) ; <nl> + float f = ( float ) atof ( token ) ; <nl> + token + = strcspn ( token , " \ t \ r " ) ; <nl> + return f ; <nl> + } <nl> + <nl> + static inline void parseFloat2 ( float & x , float & y , const char * & token ) <nl> + { <nl> + x = parseFloat ( token ) ; <nl> + y = parseFloat ( token ) ; <nl> + } <nl> + <nl> + static inline void parseFloat3 ( float & x , float & y , float & z , const char * & token ) <nl> + { <nl> + x = parseFloat ( token ) ; <nl> + y = parseFloat ( token ) ; <nl> + z = parseFloat ( token ) ; <nl> + } <nl> + <nl> + / / Parse triples : i , i / j / k , i / / k , i / j <nl> + static vertex_index parseTriple ( const char * & token , int vsize , int vnsize , int vtsize ) <nl> + { <nl> + vertex_index vi ( - 1 ) ; <nl> + <nl> + vi . v_idx = fixIndex ( atoi ( token ) , vsize ) ; <nl> + token + = strcspn ( token , " / \ t \ r " ) ; <nl> + if ( token [ 0 ] ! = ' / ' ) { <nl> + return vi ; <nl> + } <nl> + token + + ; <nl> + <nl> + / / i / / k <nl> + if ( token [ 0 ] = = ' / ' ) { <nl> + token + + ; <nl> + vi . vn_idx = fixIndex ( atoi ( token ) , vnsize ) ; <nl> + token + = strcspn ( token , " / \ t \ r " ) ; <nl> + return vi ; <nl> + } <nl> + <nl> + / / i / j / k or i / j <nl> + vi . vt_idx = fixIndex ( atoi ( token ) , vtsize ) ; <nl> + token + = strcspn ( token , " / \ t \ r " ) ; <nl> + if ( token [ 0 ] ! = ' / ' ) { <nl> + return vi ; <nl> + } <nl> + <nl> + / / i / j / k <nl> + token + + ; / / skip ' / ' <nl> + vi . vn_idx = fixIndex ( atoi ( token ) , vnsize ) ; <nl> + token + = strcspn ( token , " / \ t \ r " ) ; <nl> + return vi ; <nl> + } <nl> + <nl> + static ssize_t updateVertex ( std : : map < vertex_index , ssize_t > & vertexCache , std : : vector < float > & positions , std : : vector < float > & normals , <nl> + std : : vector < float > & texcoords , const std : : vector < float > & in_positions , const std : : vector < float > & in_normals , const std : : vector < float > & in_texcoords , <nl> + const vertex_index & i ) <nl> + { <nl> + const auto it = vertexCache . find ( i ) ; <nl> + <nl> + if ( it ! = vertexCache . end ( ) ) <nl> + { <nl> + / / found cache <nl> + return it - > second ; <nl> + } <nl> + <nl> + assert ( in_positions . size ( ) > ( 3 * i . v_idx + 2 ) ) ; <nl> + <nl> + positions . push_back ( in_positions [ 3 * i . v_idx + 0 ] ) ; <nl> + positions . push_back ( in_positions [ 3 * i . v_idx + 1 ] ) ; <nl> + positions . push_back ( in_positions [ 3 * i . v_idx + 2 ] ) ; <nl> + <nl> + if ( i . vn_idx > = 0 ) <nl> + { <nl> + normals . push_back ( in_normals [ 3 * i . vn_idx + 0 ] ) ; <nl> + normals . push_back ( in_normals [ 3 * i . vn_idx + 1 ] ) ; <nl> + normals . push_back ( in_normals [ 3 * i . vn_idx + 2 ] ) ; <nl> + } <nl> + <nl> + if ( i . vt_idx > = 0 ) <nl> + { <nl> + texcoords . push_back ( in_texcoords [ 2 * i . vt_idx + 0 ] ) ; <nl> + texcoords . push_back ( in_texcoords [ 2 * i . vt_idx + 1 ] ) ; <nl> + } <nl> + <nl> + auto idx = positions . size ( ) / 3 - 1 ; <nl> + vertexCache [ i ] = idx ; <nl> + <nl> + return idx ; <nl> + } <nl> + <nl> + static bool exportFaceGroupToShape ( std : : map < vertex_index , ssize_t > & vertexCache , ObjLoader : : shapes_t & shapes , const std : : vector < float > & in_positions , <nl> + const std : : vector < float > & in_normals , const std : : vector < float > & in_texcoords , const std : : vector < std : : vector < vertex_index > > & faceGroup , <nl> + const ObjLoader : : material_t & material , const std : : string & name ) <nl> + { <nl> + if ( faceGroup . empty ( ) ) <nl> + { <nl> + return false ; <nl> + } <nl> + <nl> + / / Flattened version of vertex data <nl> + std : : vector < float > & positions = shapes . positions ; <nl> + std : : vector < float > & normals = shapes . normals ; <nl> + std : : vector < float > & texcoords = shapes . texcoords ; <nl> + std : : vector < unsigned short > indices ; <nl> + <nl> + / / Flatten vertices and indices <nl> + for ( size_t i = 0 ; i < faceGroup . size ( ) ; i + + ) <nl> + { <nl> + const std : : vector < vertex_index > & face = faceGroup [ i ] ; <nl> + <nl> + vertex_index i0 = face [ 0 ] ; <nl> + vertex_index i1 ( - 1 ) ; <nl> + vertex_index i2 = face [ 1 ] ; <nl> + <nl> + size_t npolys = face . size ( ) ; <nl> + <nl> + / / Polygon - > triangle fan conversion <nl> + for ( size_t k = 2 ; k < npolys ; k + + ) <nl> + { <nl> + i1 = i2 ; <nl> + i2 = face [ k ] ; <nl> + <nl> + unsigned short v0 = updateVertex ( vertexCache , positions , normals , texcoords , in_positions , in_normals , in_texcoords , i0 ) ; <nl> + unsigned short v1 = updateVertex ( vertexCache , positions , normals , texcoords , in_positions , in_normals , in_texcoords , i1 ) ; <nl> + unsigned short v2 = updateVertex ( vertexCache , positions , normals , texcoords , in_positions , in_normals , in_texcoords , i2 ) ; <nl> + <nl> + indices . push_back ( v0 ) ; <nl> + indices . push_back ( v1 ) ; <nl> + indices . push_back ( v2 ) ; <nl> + } <nl> + } <nl> + <nl> + ObjLoader : : shape_t shape ; <nl> + shape . name = name ; <nl> + shape . material = material ; <nl> + shape . mesh . indices . swap ( indices ) ; <nl> + <nl> + shapes . shapes . push_back ( shape ) ; <nl> + return true ; <nl> + <nl> + } <nl> + <nl> + std : : string trim ( const std : : string & str ) <nl> + { <nl> + if ( str . empty ( ) ) <nl> + return str ; <nl> + auto len = str . length ( ) ; <nl> + char c = str [ len - 1 ] ; <nl> + while ( c = = ' \ r ' | | c = = ' \ n ' ) <nl> + { <nl> + len - - ; <nl> + c = str [ len - 1 ] ; <nl> + } <nl> + return str . substr ( 0 , len ) ; <nl> + } <nl> + <nl> + void InitMaterial ( ObjLoader : : material_t & material ) <nl> + { <nl> + material . name = " " ; <nl> + material . ambient_texname = " " ; <nl> + material . diffuse_texname = " " ; <nl> + material . specular_texname = " " ; <nl> + material . normal_texname = " " ; <nl> + for ( int i = 0 ; i < 3 ; i + + ) <nl> + { <nl> + material . ambient [ i ] = 0 . f ; <nl> + material . diffuse [ i ] = 0 . f ; <nl> + material . specular [ i ] = 0 . f ; <nl> + material . transmittance [ i ] = 0 . f ; <nl> + material . emission [ i ] = 0 . f ; <nl> + } <nl> + material . illum = 0 ; <nl> + material . dissolve = 1 . f ; <nl> + material . shininess = 1 . f ; <nl> + material . unknown_parameter . clear ( ) ; <nl> + } <nl> + <nl> + std : : string LoadMtl ( std : : map < std : : string , ObjLoader : : material_t > & material_map , const char * filename , const char * mtl_basepath ) <nl> + { <nl> + material_map . clear ( ) ; <nl> + std : : stringstream err ; <nl> + <nl> + std : : string filepath ; <nl> + <nl> + if ( mtl_basepath ) <nl> + { <nl> + filepath = std : : string ( mtl_basepath ) + std : : string ( filename ) ; <nl> + } <nl> + else <nl> + { <nl> + filepath = std : : string ( filename ) ; <nl> + } <nl> + <nl> + std : : ifstream ifs ( filepath . c_str ( ) ) ; <nl> + if ( ! ifs ) <nl> + { <nl> + err < < " Cannot open file [ " < < filepath < < " ] " < < std : : endl ; <nl> + return err . str ( ) ; <nl> + } <nl> + <nl> + ObjLoader : : material_t material ; <nl> + <nl> + int maxchars = 8192 ; / / Alloc enough size . <nl> + std : : vector < char > buf ( maxchars ) ; / / Alloc enough size . <nl> + while ( ifs . peek ( ) ! = - 1 ) <nl> + { <nl> + ifs . getline ( & buf [ 0 ] , maxchars ) ; <nl> + <nl> + std : : string linebuf ( & buf [ 0 ] ) ; <nl> + <nl> + / / Trim newline ' \ r \ n ' or ' \ r ' <nl> + if ( linebuf . size ( ) > 0 ) <nl> + { <nl> + if ( linebuf [ linebuf . size ( ) - 1 ] = = ' \ n ' ) linebuf . erase ( linebuf . size ( ) - 1 ) ; <nl> + } <nl> + if ( linebuf . size ( ) > 0 ) <nl> + { <nl> + if ( linebuf [ linebuf . size ( ) - 1 ] = = ' \ n ' ) linebuf . erase ( linebuf . size ( ) - 1 ) ; <nl> + } <nl> + <nl> + / / Skip if empty line . <nl> + if ( linebuf . empty ( ) ) <nl> + { <nl> + continue ; <nl> + } <nl> + <nl> + / / Skip leading space . <nl> + const char * token = linebuf . c_str ( ) ; <nl> + token + = strspn ( token , " \ t " ) ; <nl> + <nl> + assert ( token ) ; <nl> + if ( token [ 0 ] = = ' \ 0 ' ) continue ; / / empty line <nl> + <nl> + if ( token [ 0 ] = = ' # ' ) continue ; / / comment line <nl> + <nl> + / / new mtl <nl> + if ( ( 0 = = strncmp ( token , " newmtl " , 6 ) ) & & isSpace ( ( token [ 6 ] ) ) ) <nl> + { <nl> + / / flush previous material . <nl> + material_map . insert ( std : : pair < std : : string , ObjLoader : : material_t > ( material . name , material ) ) ; <nl> + <nl> + / / initial temporary material <nl> + InitMaterial ( material ) ; <nl> + <nl> + / / set new mtl name <nl> + char namebuf [ 4096 ] ; <nl> + token + = 7 ; <nl> + sscanf ( token , " % s " , namebuf ) ; <nl> + material . name = namebuf ; <nl> + continue ; <nl> + } <nl> + <nl> + / / ambient <nl> + if ( token [ 0 ] = = ' K ' & & token [ 1 ] = = ' a ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + float r , g , b ; <nl> + parseFloat3 ( r , g , b , token ) ; <nl> + material . ambient [ 0 ] = r ; <nl> + material . ambient [ 1 ] = g ; <nl> + material . ambient [ 2 ] = b ; <nl> + continue ; <nl> + } <nl> + <nl> + / / diffuse <nl> + if ( token [ 0 ] = = ' K ' & & token [ 1 ] = = ' d ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + float r , g , b ; <nl> + parseFloat3 ( r , g , b , token ) ; <nl> + material . diffuse [ 0 ] = r ; <nl> + material . diffuse [ 1 ] = g ; <nl> + material . diffuse [ 2 ] = b ; <nl> + continue ; <nl> + } <nl> + <nl> + / / specular <nl> + if ( token [ 0 ] = = ' K ' & & token [ 1 ] = = ' s ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + float r , g , b ; <nl> + parseFloat3 ( r , g , b , token ) ; <nl> + material . specular [ 0 ] = r ; <nl> + material . specular [ 1 ] = g ; <nl> + material . specular [ 2 ] = b ; <nl> + continue ; <nl> + } <nl> + <nl> + / / transmittance <nl> + if ( token [ 0 ] = = ' K ' & & token [ 1 ] = = ' t ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + float r , g , b ; <nl> + parseFloat3 ( r , g , b , token ) ; <nl> + material . transmittance [ 0 ] = r ; <nl> + material . transmittance [ 1 ] = g ; <nl> + material . transmittance [ 2 ] = b ; <nl> + continue ; <nl> + } <nl> + <nl> + / / ior ( index of refraction ) <nl> + if ( token [ 0 ] = = ' N ' & & token [ 1 ] = = ' i ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + material . ior = parseFloat ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / emission <nl> + if ( token [ 0 ] = = ' K ' & & token [ 1 ] = = ' e ' & & isSpace ( token [ 2 ] ) ) <nl> + { <nl> + token + = 2 ; <nl> + float r , g , b ; <nl> + parseFloat3 ( r , g , b , token ) ; <nl> + material . emission [ 0 ] = r ; <nl> + material . emission [ 1 ] = g ; <nl> + material . emission [ 2 ] = b ; <nl> + continue ; <nl> + } <nl> + <nl> + / / shininess <nl> + if ( token [ 0 ] = = ' N ' & & token [ 1 ] = = ' s ' & & isSpace ( token [ 2 ] ) ) <nl> + { <nl> + token + = 2 ; <nl> + material . shininess = parseFloat ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / illum model <nl> + if ( 0 = = strncmp ( token , " illum " , 5 ) & & isSpace ( token [ 5 ] ) ) <nl> + { <nl> + token + = 6 ; <nl> + material . illum = parseInt ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / dissolve <nl> + if ( ( token [ 0 ] = = ' d ' & & isSpace ( token [ 1 ] ) ) ) <nl> + { <nl> + token + = 1 ; <nl> + material . dissolve = parseFloat ( token ) ; <nl> + continue ; <nl> + } <nl> + if ( token [ 0 ] = = ' T ' & & token [ 1 ] = = ' r ' & & isSpace ( token [ 2 ] ) ) <nl> + { <nl> + token + = 2 ; <nl> + material . dissolve = parseFloat ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / ambient texture <nl> + if ( ( 0 = = strncmp ( token , " map_Ka " , 6 ) ) & & isSpace ( token [ 6 ] ) ) <nl> + { <nl> + token + = 7 ; <nl> + material . ambient_texname = trim ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / diffuse texture <nl> + if ( ( 0 = = strncmp ( token , " map_Kd " , 6 ) ) & & isSpace ( token [ 6 ] ) ) <nl> + { <nl> + token + = 7 ; <nl> + material . diffuse_texname = trim ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / specular texture <nl> + if ( ( 0 = = strncmp ( token , " map_Ks " , 6 ) ) & & isSpace ( token [ 6 ] ) ) <nl> + { <nl> + token + = 7 ; <nl> + material . specular_texname = trim ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / normal texture <nl> + if ( ( 0 = = strncmp ( token , " map_Ns " , 6 ) ) & & isSpace ( token [ 6 ] ) ) <nl> + { <nl> + token + = 7 ; <nl> + material . normal_texname = trim ( token ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / unknown parameter <nl> + const char * _space = strchr ( token , ' ' ) ; <nl> + if ( ! _space ) <nl> + { <nl> + _space = strchr ( token , ' \ t ' ) ; <nl> + } <nl> + if ( _space ) <nl> + { <nl> + auto len = _space - token ; <nl> + std : : string key ( token , len ) ; <nl> + std : : string value = _space + 1 ; <nl> + material . unknown_parameter . insert ( std : : pair < std : : string , std : : string > ( key , value ) ) ; <nl> + } <nl> + } <nl> + / / flush last material . <nl> + material_map . insert ( std : : pair < std : : string , ObjLoader : : material_t > ( material . name , material ) ) ; <nl> + return err . str ( ) ; <nl> + } <nl> + <nl> + std : : string ObjLoader : : LoadObj ( shapes_t & shapes , const char * filename , const char * mtl_basepath ) <nl> + { <nl> + shapes . reset ( ) ; <nl> + <nl> + std : : stringstream err ; <nl> + std : : istringstream ifs ( FileUtils : : getInstance ( ) - > getStringFromFile ( filename ) ) ; <nl> + std : : map < vertex_index , ssize_t > vertexCache ; <nl> + / / std : : ifstream ifs ( filename ) ; <nl> + <nl> + if ( ! ifs ) <nl> + { <nl> + err < < " Cannot open file [ " < < filename < < " ] " < < std : : endl ; <nl> + return err . str ( ) ; <nl> + } <nl> + <nl> + std : : vector < float > v ; <nl> + std : : vector < float > vn ; <nl> + std : : vector < float > vt ; <nl> + std : : vector < std : : vector < vertex_index > > faceGroup ; <nl> + std : : string name ; <nl> + <nl> + / / material <nl> + std : : map < std : : string , material_t > material_map ; <nl> + material_t material ; <nl> + <nl> + int maxchars = 8192 ; / / Alloc enough size . <nl> + std : : vector < char > buf ( maxchars ) ; / / Alloc enough size . <nl> + while ( ifs . peek ( ) ! = - 1 ) <nl> + { <nl> + ifs . getline ( & buf [ 0 ] , maxchars ) ; <nl> + <nl> + std : : string linebuf ( & buf [ 0 ] ) ; <nl> + <nl> + / / Trim newline ' \ r \ n ' or ' \ r ' <nl> + if ( linebuf . size ( ) > 0 ) <nl> + { <nl> + if ( linebuf [ linebuf . size ( ) - 1 ] = = ' \ n ' ) linebuf . erase ( linebuf . size ( ) - 1 ) ; <nl> + } <nl> + if ( linebuf . size ( ) > 0 ) <nl> + { <nl> + if ( linebuf [ linebuf . size ( ) - 1 ] = = ' \ n ' ) linebuf . erase ( linebuf . size ( ) - 1 ) ; <nl> + } <nl> + <nl> + / / Skip if empty line . <nl> + if ( linebuf . empty ( ) ) <nl> + { <nl> + continue ; <nl> + } <nl> + <nl> + / / Skip leading space . <nl> + const char * token = linebuf . c_str ( ) ; <nl> + token + = strspn ( token , " \ t " ) ; <nl> + <nl> + assert ( token ) ; <nl> + if ( token [ 0 ] = = ' \ 0 ' ) continue ; / / empty line <nl> + <nl> + if ( token [ 0 ] = = ' # ' ) continue ; / / comment line <nl> + <nl> + / / vertex <nl> + if ( token [ 0 ] = = ' v ' & & isSpace ( ( token [ 1 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + float x , y , z ; <nl> + parseFloat3 ( x , y , z , token ) ; <nl> + v . push_back ( x ) ; <nl> + v . push_back ( y ) ; <nl> + v . push_back ( z ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / normal <nl> + if ( token [ 0 ] = = ' v ' & & token [ 1 ] = = ' n ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 3 ; <nl> + float x , y , z ; <nl> + parseFloat3 ( x , y , z , token ) ; <nl> + vn . push_back ( x ) ; <nl> + vn . push_back ( y ) ; <nl> + vn . push_back ( z ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / texcoord <nl> + if ( token [ 0 ] = = ' v ' & & token [ 1 ] = = ' t ' & & isSpace ( ( token [ 2 ] ) ) ) <nl> + { <nl> + token + = 3 ; <nl> + float x , y ; <nl> + parseFloat2 ( x , y , token ) ; <nl> + vt . push_back ( x ) ; <nl> + vt . push_back ( y ) ; <nl> + continue ; <nl> + } <nl> + <nl> + / / face <nl> + if ( token [ 0 ] = = ' f ' & & isSpace ( ( token [ 1 ] ) ) ) <nl> + { <nl> + token + = 2 ; <nl> + token + = strspn ( token , " \ t " ) ; <nl> + <nl> + std : : vector < vertex_index > face ; <nl> + while ( ! isNewLine ( token [ 0 ] ) ) { <nl> + vertex_index vi = parseTriple ( token , v . size ( ) / 3 , vn . size ( ) / 3 , vt . size ( ) / 2 ) ; <nl> + face . push_back ( vi ) ; <nl> + auto n = strspn ( token , " \ t \ r " ) ; <nl> + token + = n ; <nl> + } <nl> + <nl> + faceGroup . push_back ( face ) ; <nl> + <nl> + continue ; <nl> + } <nl> + <nl> + / / use mtl <nl> + if ( ( 0 = = strncmp ( token , " usemtl " , 6 ) ) & & isSpace ( ( token [ 6 ] ) ) ) <nl> + { <nl> + <nl> + char namebuf [ 4096 ] ; <nl> + token + = 7 ; <nl> + sscanf ( token , " % s " , namebuf ) ; <nl> + <nl> + if ( material_map . find ( namebuf ) ! = material_map . end ( ) ) <nl> + { <nl> + material = material_map [ namebuf ] ; <nl> + } <nl> + else <nl> + { <nl> + / / { error ! ! material not found } <nl> + InitMaterial ( material ) ; <nl> + } <nl> + continue ; <nl> + <nl> + } <nl> + <nl> + / / load mtl <nl> + if ( ( 0 = = strncmp ( token , " mtllib " , 6 ) ) & & isSpace ( ( token [ 6 ] ) ) ) <nl> + { <nl> + char namebuf [ 4096 ] ; <nl> + token + = 7 ; <nl> + sscanf ( token , " % s " , namebuf ) ; <nl> + <nl> + std : : string err_mtl = LoadMtl ( material_map , namebuf , mtl_basepath ) ; <nl> + if ( ! err_mtl . empty ( ) ) <nl> + { <nl> + faceGroup . clear ( ) ; / / for safety <nl> + / / return err_mtl ; <nl> + } <nl> + continue ; <nl> + } <nl> + <nl> + / / group name <nl> + if ( token [ 0 ] = = ' g ' & & isSpace ( ( token [ 1 ] ) ) ) <nl> + { <nl> + / / flush previous face group . <nl> + shape_t shape ; <nl> + exportFaceGroupToShape ( vertexCache , shapes , v , vn , vt , faceGroup , material , name ) ; <nl> + <nl> + faceGroup . clear ( ) ; <nl> + <nl> + std : : vector < std : : string > names ; <nl> + while ( ! isNewLine ( token [ 0 ] ) ) <nl> + { <nl> + std : : string str = parseString ( token ) ; <nl> + names . push_back ( str ) ; <nl> + token + = strspn ( token , " \ t \ r " ) ; / / skip tag <nl> + } <nl> + <nl> + assert ( names . size ( ) > 0 ) ; <nl> + <nl> + / / names [ 0 ] must be ' g ' , so skipt 0th element . <nl> + if ( names . size ( ) > 1 ) <nl> + { <nl> + name = names [ 1 ] ; <nl> + } <nl> + else <nl> + { <nl> + name = " " ; <nl> + } <nl> + <nl> + continue ; <nl> + } <nl> + <nl> + / / object name <nl> + if ( token [ 0 ] = = ' o ' & & isSpace ( ( token [ 1 ] ) ) ) <nl> + { <nl> + / / flush previous face group . <nl> + shape_t shape ; <nl> + exportFaceGroupToShape ( vertexCache , shapes , v , vn , vt , faceGroup , material , name ) ; <nl> + <nl> + faceGroup . clear ( ) ; <nl> + <nl> + / / @ todo { multiple object name ? } <nl> + char namebuf [ 4096 ] ; <nl> + token + = 2 ; <nl> + sscanf ( token , " % s " , namebuf ) ; <nl> + name = std : : string ( namebuf ) ; <nl> + <nl> + continue ; <nl> + } <nl> + <nl> + / / Ignore unknown command . <nl> + } <nl> + <nl> + shape_t shape ; <nl> + exportFaceGroupToShape ( vertexCache , shapes , v , vn , vt , faceGroup , material , name ) ; <nl> + faceGroup . clear ( ) ; / / for safety <nl> + <nl> + return err . str ( ) ; <nl> + } <nl> + <nl> + NS_CC_END <nl> new file mode 100644 <nl> index 000000000000 . . a0ef97cb4d4e <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCObjLoader . h <nl> <nl> + / / <nl> + / / Copyright 2012 - 2013 , Syoyo Fujita . <nl> + / / <nl> + / / Licensed under 2 - clause BSD liecense . <nl> + / / <nl> + / / copied from Syoyo Fujita <nl> + / / https : / / github . com / syoyo / tinyobjloader <nl> + <nl> + # ifndef __CCOBJLOADER_H__ <nl> + # define __CCOBJLOADER_H__ <nl> + <nl> + # include < string > <nl> + # include < vector > <nl> + # include < map > <nl> + # include " base / ccTypes . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + class ObjLoader <nl> + { <nl> + public : <nl> + typedef struct <nl> + { <nl> + std : : string name ; <nl> + <nl> + float ambient [ 3 ] ; <nl> + float diffuse [ 3 ] ; <nl> + float specular [ 3 ] ; <nl> + float transmittance [ 3 ] ; <nl> + float emission [ 3 ] ; <nl> + float shininess ; <nl> + float ior ; / / index of refraction <nl> + float dissolve ; / / 1 = = opaque ; 0 = = fully transparent <nl> + / / illumination model ( see http : / / www . fileformat . info / format / material / ) <nl> + int illum ; <nl> + <nl> + std : : string ambient_texname ; <nl> + std : : string diffuse_texname ; <nl> + std : : string specular_texname ; <nl> + std : : string normal_texname ; <nl> + std : : map < std : : string , std : : string > unknown_parameter ; <nl> + } material_t ; <nl> + <nl> + typedef struct <nl> + { <nl> + std : : vector < unsigned short > indices ; <nl> + } mesh_t ; <nl> + <nl> + typedef struct <nl> + { <nl> + std : : string name ; <nl> + material_t material ; <nl> + mesh_t mesh ; <nl> + } shape_t ; <nl> + <nl> + typedef struct <nl> + { <nl> + std : : vector < float > positions ; <nl> + std : : vector < float > normals ; <nl> + std : : vector < float > texcoords ; <nl> + <nl> + std : : vector < shape_t > shapes ; <nl> + <nl> + void reset ( ) <nl> + { <nl> + positions . clear ( ) ; <nl> + normals . clear ( ) ; <nl> + texcoords . clear ( ) ; <nl> + shapes . clear ( ) ; <nl> + } <nl> + } shapes_t ; <nl> + <nl> + / / / Loads . obj from a file . <nl> + / / / ' shapes ' will be filled with parsed shape data <nl> + / / / The function returns error string . <nl> + / / / Returns empty string when loading . obj success . <nl> + / / / ' mtl_basepath ' is optional , and used for base path for . mtl file . <nl> + static std : : string LoadObj ( <nl> + shapes_t & shapes , / / [ output ] <nl> + const char * filename , <nl> + const char * mtl_basepath = NULL ) ; <nl> + <nl> + } ; <nl> + <nl> + NS_CC_END <nl> + <nl> + # endif / / _TINY_OBJ_LOADER_H <nl> new file mode 100644 <nl> index 000000000000 . . 06d9b1be7e1e <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCSprite3D . cpp <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # include " 3d / CCSprite3D . h " <nl> + # include " 3d / CCSprite3DDataCache . h " <nl> + # include " 3d / CCMesh . h " <nl> + # include " 3d / CCObjLoader . h " <nl> + <nl> + # include " base / CCDirector . h " <nl> + # include " base / CCPlatformMacros . h " <nl> + # include " base / ccMacros . h " <nl> + # include " platform / CCFileUtils . h " <nl> + # include " renderer / CCTextureCache . h " <nl> + # include " renderer / CCRenderer . h " <nl> + # include " renderer / CCGLProgramState . h " <nl> + # include " renderer / CCGLProgramCache . h " <nl> + <nl> + # include " deprecated / CCString . h " / / For StringUtils : : format <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + std : : string s_attributeNames [ ] = { GLProgram : : ATTRIBUTE_NAME_POSITION , GLProgram : : ATTRIBUTE_NAME_COLOR , GLProgram : : ATTRIBUTE_NAME_TEX_COORD , GLProgram : : ATTRIBUTE_NAME_NORMAL } ; <nl> + <nl> + Sprite3D * Sprite3D : : create ( const std : : string & modelPath ) <nl> + { <nl> + if ( modelPath . length ( ) < 4 ) <nl> + CCASSERT ( false , " improper name specified when creating Sprite3D " ) ; <nl> + <nl> + auto sprite = new Sprite3D ( ) ; <nl> + if ( sprite & & sprite - > initWithFile ( modelPath ) ) <nl> + { <nl> + sprite - > autorelease ( ) ; <nl> + return sprite ; <nl> + } <nl> + CC_SAFE_DELETE ( sprite ) ; <nl> + return nullptr ; <nl> + } <nl> + <nl> + Sprite3D * Sprite3D : : create ( const std : : string & modelPath , const std : : string & texturePath ) <nl> + { <nl> + auto sprite = create ( modelPath ) ; <nl> + if ( sprite ) <nl> + { <nl> + sprite - > setTexture ( texturePath ) ; <nl> + } <nl> + <nl> + return sprite ; <nl> + } <nl> + <nl> + / / Sprite3D * Sprite3D : : create ( Mesh * mesh , const std : : string & texturePath ) <nl> + / / { <nl> + / / CCASSERT ( nullptr ! = mesh , " Could not create a Sprite3D from a null Mesh " ) ; <nl> + / / auto sprite = new Sprite3D ( ) ; <nl> + / / if ( sprite ) <nl> + / / { <nl> + / / sprite - > _mesh = mesh ; <nl> + / / sprite - > _mesh - > retain ( ) ; <nl> + / / sprite - > setTexture ( texturePath ) ; <nl> + / / sprite - > autorelease ( ) ; <nl> + / / return sprite ; <nl> + / / } <nl> + / / CC_SAFE_DELETE ( sprite ) ; <nl> + / / return nullptr ; <nl> + / / } <nl> + <nl> + / / . mtl file should at the same directory with the same name if exist <nl> + bool Sprite3D : : loadFromObj ( const std : : string & path ) <nl> + { <nl> + std : : string fullPath = FileUtils : : getInstance ( ) - > fullPathForFilename ( path ) ; <nl> + <nl> + / / . mtl file directory <nl> + std : : string dir = " " ; <nl> + auto last = fullPath . rfind ( " / " ) ; <nl> + if ( last ! = - 1 ) <nl> + dir = fullPath . substr ( 0 , last + 1 ) ; <nl> + <nl> + ObjLoader : : shapes_t shapes ; <nl> + std : : string errstr = ObjLoader : : LoadObj ( shapes , fullPath . c_str ( ) , dir . c_str ( ) ) ; <nl> + if ( ! errstr . empty ( ) ) <nl> + return false ; <nl> + <nl> + / / convert to mesh and material <nl> + std : : vector < unsigned short > indices ; <nl> + std : : vector < std : : string > matnames ; <nl> + std : : string texname ; <nl> + for ( auto it = shapes . shapes . begin ( ) ; it ! = shapes . shapes . end ( ) ; it + + ) <nl> + { <nl> + indices . insert ( indices . end ( ) , ( * it ) . mesh . indices . begin ( ) , ( * it ) . mesh . indices . end ( ) ) ; <nl> + / / indices . push_back ( ( * it ) . mesh . indices ) ; <nl> + if ( texname . empty ( ) ) <nl> + texname = ( * it ) . material . diffuse_texname ; <nl> + else if ( texname ! = ( * it ) . material . diffuse_texname ) <nl> + { <nl> + CCLOGWARN ( " cocos2d : WARNING : more than one texture in % s " , path . c_str ( ) ) ; <nl> + } <nl> + <nl> + matnames . push_back ( dir + ( * it ) . material . diffuse_texname ) ; <nl> + } <nl> + _mesh = Mesh : : create ( shapes . positions , shapes . normals , shapes . texcoords , indices ) ; <nl> + <nl> + _mesh - > retain ( ) ; <nl> + if ( _mesh = = nullptr ) <nl> + return false ; <nl> + <nl> + if ( matnames . size ( ) ) <nl> + { <nl> + setTexture ( matnames [ 0 ] ) ; <nl> + } <nl> + genGLProgramState ( ) ; <nl> + <nl> + / / add to cache <nl> + Sprite3DDataCache : : getInstance ( ) - > addSprite3D ( fullPath , _mesh , matnames . size ( ) > 0 ? matnames [ 0 ] : " " ) ; <nl> + <nl> + return true ; <nl> + } <nl> + <nl> + Sprite3D : : Sprite3D ( ) <nl> + : _mesh ( nullptr ) <nl> + , _texture ( nullptr ) <nl> + , _blend ( BlendFunc : : ALPHA_NON_PREMULTIPLIED ) <nl> + { <nl> + } <nl> + <nl> + Sprite3D : : ~ Sprite3D ( ) <nl> + { <nl> + CC_SAFE_RELEASE_NULL ( _texture ) ; <nl> + CC_SAFE_RELEASE_NULL ( _mesh ) ; <nl> + } <nl> + <nl> + bool Sprite3D : : initWithFile ( const std : : string & path ) <nl> + { <nl> + CC_SAFE_RELEASE_NULL ( _mesh ) ; <nl> + <nl> + CC_SAFE_RELEASE_NULL ( _texture ) ; <nl> + <nl> + / / find from the cache <nl> + Mesh * mesh = Sprite3DDataCache : : getInstance ( ) - > getSprite3DMesh ( path ) ; <nl> + if ( mesh ) <nl> + { <nl> + _mesh = mesh ; <nl> + _mesh - > retain ( ) ; <nl> + <nl> + auto tex = Sprite3DDataCache : : getInstance ( ) - > getSprite3DTexture ( path ) ; <nl> + setTexture ( tex ) ; <nl> + <nl> + genGLProgramState ( ) ; <nl> + <nl> + return true ; <nl> + } <nl> + else <nl> + { <nl> + / / load from file <nl> + std : : string ext = path . substr ( path . length ( ) - 4 , 4 ) ; <nl> + if ( ext ! = " . obj " | | ! loadFromObj ( path ) ) <nl> + { <nl> + return false ; <nl> + } <nl> + return true ; <nl> + } <nl> + } <nl> + <nl> + void Sprite3D : : genGLProgramState ( ) <nl> + { <nl> + auto programstate = GLProgramState : : getOrCreateWithGLProgram ( getDefaultGLProgram ( _mesh - > hasVertexAttrib ( GLProgram : : VERTEX_ATTRIB_TEX_COORD ) ) ) ; <nl> + long offset = 0 ; <nl> + auto attributeCount = _mesh - > getMeshVertexAttribCount ( ) ; <nl> + for ( auto k = 0 ; k < attributeCount ; k + + ) { <nl> + auto meshattribute = _mesh - > getMeshVertexAttribute ( k ) ; <nl> + programstate - > setVertexAttribPointer ( s_attributeNames [ meshattribute . vertexAttrib ] , <nl> + meshattribute . size , <nl> + meshattribute . type , <nl> + GL_FALSE , <nl> + _mesh - > getVertexSizeInBytes ( ) , <nl> + ( GLvoid * ) offset ) ; <nl> + offset + = meshattribute . attribSizeBytes ; <nl> + } <nl> + <nl> + setGLProgramState ( programstate ) ; <nl> + } <nl> + <nl> + GLProgram * Sprite3D : : getDefaultGLProgram ( bool textured ) <nl> + { <nl> + if ( textured ) <nl> + { <nl> + return GLProgramCache : : getInstance ( ) - > getGLProgram ( GLProgram : : SHADER_3D_POSITION_TEXTURE ) ; <nl> + } <nl> + else <nl> + { <nl> + return GLProgramCache : : getInstance ( ) - > getGLProgram ( GLProgram : : SHADER_3D_POSITION ) ; <nl> + } <nl> + } <nl> + <nl> + void Sprite3D : : setTexture ( const std : : string & texFile ) <nl> + { <nl> + auto tex = Director : : getInstance ( ) - > getTextureCache ( ) - > addImage ( texFile ) ; <nl> + if ( tex & & _texture ! = tex ) { <nl> + CC_SAFE_RETAIN ( tex ) ; <nl> + CC_SAFE_RELEASE_NULL ( _texture ) ; <nl> + _texture = tex ; <nl> + } <nl> + } <nl> + <nl> + void Sprite3D : : setTexture ( Texture2D * texture ) <nl> + { <nl> + if ( _texture ! = texture ) { <nl> + CC_SAFE_RETAIN ( texture ) ; <nl> + CC_SAFE_RELEASE_NULL ( _texture ) ; <nl> + _texture = texture ; <nl> + } <nl> + } <nl> + <nl> + void Sprite3D : : draw ( Renderer * renderer , const Mat4 & transform , bool transformUpdated ) <nl> + { <nl> + GLProgramState * programstate = getGLProgramState ( ) ; <nl> + Color4F color ( getDisplayedColor ( ) ) ; <nl> + color . a = getDisplayedOpacity ( ) / 255 . 0f ; <nl> + <nl> + GLuint textureID = _texture ? _texture - > getName ( ) : 0 ; <nl> + _meshCommand . init ( _globalZOrder , <nl> + textureID , <nl> + programstate , <nl> + _blend , <nl> + _mesh - > getVertexBuffer ( ) , <nl> + _mesh - > getIndexBuffer ( ) , <nl> + ( GLenum ) _mesh - > getPrimitiveType ( ) , <nl> + ( GLenum ) _mesh - > getIndexFormat ( ) , <nl> + _mesh - > getIndexCount ( ) , <nl> + transform ) ; <nl> + <nl> + _meshCommand . setCullFaceEnabled ( true ) ; <nl> + _meshCommand . setDepthTestEnabled ( true ) ; <nl> + / / support tint and fade <nl> + _meshCommand . setDisplayColor ( Vec4 ( color . r , color . g , color . b , color . a ) ) ; <nl> + Director : : getInstance ( ) - > getRenderer ( ) - > addCommand ( & _meshCommand ) ; <nl> + } <nl> + <nl> + void Sprite3D : : setBlendFunc ( const BlendFunc & blendFunc ) <nl> + { <nl> + if ( _blend . src ! = blendFunc . src | | _blend . dst ! = blendFunc . dst ) <nl> + { <nl> + _blend = blendFunc ; <nl> + } <nl> + } <nl> + <nl> + const BlendFunc & Sprite3D : : getBlendFunc ( ) const <nl> + { <nl> + return _blend ; <nl> + } <nl> + <nl> + NS_CC_END <nl> new file mode 100644 <nl> index 000000000000 . . 3d6559f662b5 <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCSprite3D . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # ifndef __CCSPRITE3D_H__ <nl> + # define __CCSPRITE3D_H__ <nl> + <nl> + # include < vector > <nl> + <nl> + # include " base / CCVector . h " <nl> + # include " base / ccTypes . h " <nl> + # include " base / CCProtocols . h " <nl> + # include " 2d / CCNode . h " <nl> + # include " renderer / CCMeshCommand . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + class GLProgramState ; <nl> + class Mesh ; <nl> + class Texture2D ; <nl> + <nl> + / * * Sprite3D : TODO add description * / <nl> + class Sprite3D : public Node , public BlendProtocol <nl> + { <nl> + public : <nl> + / / / creates a Sprite3D <nl> + static Sprite3D * create ( const std : : string & modelPath ) ; <nl> + <nl> + / / creates a Sprite3D . It only supports one texture , and overrides the internal texture with ' texturePath ' <nl> + static Sprite3D * create ( const std : : string & modelPath , const std : : string & texturePath ) ; <nl> + <nl> + / / set texture <nl> + void setTexture ( const std : : string & texFile ) ; <nl> + void setTexture ( Texture2D * texture ) ; <nl> + <nl> + Mesh * getMesh ( ) const { return _mesh ; } <nl> + <nl> + / / overrides <nl> + virtual void setBlendFunc ( const BlendFunc & blendFunc ) override ; <nl> + virtual const BlendFunc & getBlendFunc ( ) const override ; <nl> + <nl> + protected : <nl> + Sprite3D ( ) ; <nl> + virtual ~ Sprite3D ( ) ; <nl> + bool initWithFile ( const std : : string & path ) ; <nl> + <nl> + / / . mtl file should at the same directory with the same name if exist <nl> + bool loadFromObj ( const std : : string & path ) ; <nl> + <nl> + virtual void draw ( Renderer * renderer , const Mat4 & transform , bool transformUpdated ) override ; <nl> + <nl> + virtual GLProgram * getDefaultGLProgram ( bool textured = true ) ; <nl> + <nl> + void genGLProgramState ( ) ; <nl> + <nl> + Mesh * _mesh ; <nl> + MeshCommand _meshCommand ; <nl> + Texture2D * _texture ; <nl> + BlendFunc _blend ; <nl> + } ; <nl> + <nl> + extern std : : string s_attributeNames [ ] ; <nl> + <nl> + NS_CC_END <nl> + # endif / / __SPRITE3D_H_ <nl> new file mode 100644 <nl> index 000000000000 . . 3b5748b49fb2 <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCSprite3DDataCache . cpp <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # include " 3d / CCSprite3DDataCache . h " <nl> + <nl> + # include " 3d / CCMesh . h " <nl> + # include " platform / CCFileUtils . h " <nl> + # include " renderer / CCTextureCache . h " <nl> + # include " base / CCEventCustom . h " <nl> + # include " base / CCEventListenerCustom . h " <nl> + # include " base / CCEventDispatcher . h " <nl> + # include " base / CCEventType . h " <nl> + # include " base / CCDirector . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + Sprite3DDataCache * Sprite3DDataCache : : _cacheInstance = nullptr ; <nl> + <nl> + Sprite3DDataCache : : Sprite3DDataCache ( ) <nl> + { <nl> + # if ( CC_TARGET_PLATFORM = = CC_PLATFORM_ANDROID ) <nl> + / / listen the event when app go to foreground <nl> + _backToForegroundlistener = EventListenerCustom : : create ( EVENT_COME_TO_FOREGROUND , CC_CALLBACK_1 ( Sprite3DDataCache : : listenBackToForeground , this ) ) ; <nl> + Director : : getInstance ( ) - > getEventDispatcher ( ) - > addEventListenerWithFixedPriority ( _backToForegroundlistener , - 1 ) ; <nl> + # endif <nl> + } <nl> + <nl> + Sprite3DDataCache : : ~ Sprite3DDataCache ( ) <nl> + { <nl> + removeAllSprite3DData ( ) ; <nl> + # if ( CC_TARGET_PLATFORM = = CC_PLATFORM_ANDROID ) <nl> + Director : : getInstance ( ) - > getEventDispatcher ( ) - > removeEventListener ( _backToForegroundlistener ) ; <nl> + # endif <nl> + } <nl> + <nl> + Sprite3DDataCache * Sprite3DDataCache : : getInstance ( ) <nl> + { <nl> + if ( ! _cacheInstance ) <nl> + { <nl> + _cacheInstance = new Sprite3DDataCache ( ) ; <nl> + } <nl> + <nl> + return _cacheInstance ; <nl> + } <nl> + <nl> + void Sprite3DDataCache : : purgeMeshCache ( ) <nl> + { <nl> + if ( _cacheInstance ) <nl> + { <nl> + CC_SAFE_DELETE ( _cacheInstance ) ; <nl> + } <nl> + } <nl> + <nl> + bool Sprite3DDataCache : : addSprite3D ( const std : : string & fileName , Mesh * mesh , const std : : string & texture ) <nl> + { <nl> + const std : : string fullPath = FileUtils : : getInstance ( ) - > fullPathForFilename ( fileName ) ; <nl> + auto itr = _sprite3DDatas . find ( fullPath ) ; <nl> + if ( itr = = _sprite3DDatas . end ( ) ) <nl> + { <nl> + Sprite3DData data ; <nl> + data . mesh = mesh ; <nl> + CC_SAFE_RETAIN ( mesh ) ; <nl> + data . texture = texture ; <nl> + _sprite3DDatas [ fullPath ] = data ; <nl> + return true ; <nl> + } <nl> + return false ; <nl> + } <nl> + <nl> + Mesh * Sprite3DDataCache : : getSprite3DMesh ( const std : : string & fileName ) <nl> + { <nl> + const std : : string fullPath = FileUtils : : getInstance ( ) - > fullPathForFilename ( fileName ) ; <nl> + auto itr = _sprite3DDatas . find ( fullPath ) ; <nl> + if ( itr ! = _sprite3DDatas . end ( ) ) <nl> + return itr - > second . mesh ; <nl> + return nullptr ; <nl> + } <nl> + <nl> + Texture2D * Sprite3DDataCache : : getSprite3DTexture ( const std : : string & fileName ) <nl> + { <nl> + const std : : string fullPath = FileUtils : : getInstance ( ) - > fullPathForFilename ( fileName ) ; <nl> + auto itr = _sprite3DDatas . find ( fullPath ) ; <nl> + if ( itr ! = _sprite3DDatas . end ( ) ) <nl> + { <nl> + auto cache = Director : : getInstance ( ) - > getTextureCache ( ) ; <nl> + return cache - > addImage ( itr - > second . texture ) ; <nl> + } <nl> + return nullptr ; <nl> + } <nl> + <nl> + void Sprite3DDataCache : : removeAllSprite3DData ( ) <nl> + { <nl> + for ( auto itr = _sprite3DDatas . begin ( ) ; itr ! = _sprite3DDatas . end ( ) ; itr + + ) { <nl> + CC_SAFE_RELEASE_NULL ( itr - > second . mesh ) ; <nl> + } <nl> + _sprite3DDatas . clear ( ) ; <nl> + } <nl> + void Sprite3DDataCache : : removeUnusedSprite3DData ( ) <nl> + { <nl> + for ( auto it = _sprite3DDatas . cbegin ( ) ; it ! = _sprite3DDatas . cend ( ) ; / * nothing * / ) { <nl> + auto value = it - > second ; <nl> + if ( value . mesh - > getReferenceCount ( ) = = 1 ) { <nl> + CCLOG ( " cocos2d : GLProgramStateCache : removing unused GLProgramState " ) ; <nl> + <nl> + value . mesh - > release ( ) ; <nl> + _sprite3DDatas . erase ( it + + ) ; <nl> + } else { <nl> + + + it ; <nl> + } <nl> + } <nl> + } <nl> + <nl> + # if ( CC_TARGET_PLATFORM = = CC_PLATFORM_ANDROID ) <nl> + void Sprite3DDataCache : : listenBackToForeground ( EventCustom * event ) <nl> + { <nl> + for ( auto iter = _sprite3DDatas . begin ( ) ; iter ! = _sprite3DDatas . end ( ) ; + + iter ) <nl> + { <nl> + auto mesh = iter - > second . mesh ; <nl> + mesh - > restore ( ) ; <nl> + } <nl> + } <nl> + # endif <nl> + <nl> + NS_CC_END <nl> new file mode 100644 <nl> index 000000000000 . . f6e80fb489ef <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CCSprite3DDataCache . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # ifndef __CCSPRIT3DDATA_CACHE_H__ <nl> + # define __CCSPRIT3DDATA_CACHE_H__ <nl> + <nl> + # include < string > <nl> + # include < unordered_map > <nl> + # include " base / ccTypes . h " <nl> + # include " base / CCMap . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + class Sprite3D ; <nl> + class Mesh ; <nl> + class EventListenerCustom ; <nl> + class EventCustom ; <nl> + class Texture2D ; <nl> + <nl> + class Sprite3DDataCache <nl> + { <nl> + public : <nl> + struct Sprite3DData <nl> + { <nl> + Mesh * mesh ; <nl> + std : : string texture ; <nl> + } ; <nl> + <nl> + static Sprite3DDataCache * getInstance ( ) ; <nl> + static void purgeMeshCache ( ) ; <nl> + <nl> + bool addSprite3D ( const std : : string & fileName , Mesh * mesh , const std : : string & texture ) ; <nl> + <nl> + Mesh * getSprite3DMesh ( const std : : string & fileName ) ; <nl> + <nl> + Texture2D * getSprite3DTexture ( const std : : string & fileName ) ; <nl> + <nl> + void removeAllSprite3DData ( ) ; <nl> + void removeUnusedSprite3DData ( ) ; <nl> + <nl> + <nl> + # if ( CC_TARGET_PLATFORM = = CC_PLATFORM_ANDROID ) <nl> + void listenBackToForeground ( EventCustom * event ) ; <nl> + # endif <nl> + <nl> + protected : <nl> + Sprite3DDataCache ( ) ; <nl> + <nl> + ~ Sprite3DDataCache ( ) ; <nl> + <nl> + static Sprite3DDataCache * _cacheInstance ; <nl> + <nl> + std : : unordered_map < std : : string , Sprite3DData > _sprite3DDatas ; / / sprites <nl> + <nl> + # if ( CC_TARGET_PLATFORM = = CC_PLATFORM_ANDROID ) <nl> + EventListenerCustom * _backToForegroundlistener ; <nl> + # endif <nl> + } ; <nl> + <nl> + NS_CC_END <nl> + <nl> + # endif / / __CCSPRIT3DDATA_CACHE_H__ <nl> new file mode 100644 <nl> index 000000000000 . . cb7d6a9de39b <nl> mmm / dev / null <nl> ppp b / cocos / 3d / CMakeLists . txt <nl> <nl> + set ( COCOS_3D_SRC <nl> + 3d / CCMesh . cpp <nl> + 3d / CCObjLoader . cpp <nl> + 3d / CCSprite3D . cpp <nl> + 3d / CCSprite3DDataCache . cpp <nl> + ) <nl> + <nl> mmm a / cocos / Android . mk <nl> ppp b / cocos / Android . mk <nl> cocos2d . cpp \ <nl> 2d / CCTransitionPageTurn . cpp \ <nl> 2d / CCTransitionProgress . cpp \ <nl> 2d / CCTweenFunction . cpp \ <nl> + 3d / CCMesh . cpp \ <nl> + 3d / CCSprite3DDataCache . cpp \ <nl> + 3d / CCObjLoader . cpp \ <nl> + 3d / CCSprite3D . cpp \ <nl> platform / CCGLViewProtocol . cpp \ <nl> platform / CCFileUtils . cpp \ <nl> platform / CCSAXParser . cpp \ <nl> renderer / CCGLProgramState . cpp \ <nl> renderer / CCGLProgramStateCache . cpp \ <nl> renderer / CCGroupCommand . cpp \ <nl> renderer / CCQuadCommand . cpp \ <nl> + renderer / CCMeshCommand . cpp \ <nl> renderer / CCRenderCommand . cpp \ <nl> renderer / CCRenderer . cpp \ <nl> renderer / CCTexture2D . cpp \ <nl> mmm a / cocos / CMakeLists . txt <nl> ppp b / cocos / CMakeLists . txt <nl> set ( COCOS_SRC <nl> ) <nl> <nl> include ( 2d / CMakeLists . txt ) <nl> + include ( 3d / CMakeLists . txt ) <nl> include ( platform / CMakeLists . txt ) <nl> include ( physics / CMakeLists . txt ) <nl> include ( math / CMakeLists . txt ) <nl> include ( storage / CMakeLists . txt ) <nl> add_library ( cocos2d STATIC <nl> $ { COCOS_SRC } <nl> $ { COCOS_2D_SRC } <nl> + $ { COCOS_3D_SRC } <nl> $ { COCOS_PLATFORM_SRC } <nl> $ { COCOS_BASE_SRC } <nl> $ { COCOS_RENDERER_SRC } <nl> mmm a / cocos / cocos2d . h <nl> ppp b / cocos / cocos2d . h <nl> THE SOFTWARE . <nl> # include " 2d / CCComponent . h " <nl> # include " 2d / CCComponentContainer . h " <nl> <nl> + / / 3d <nl> + # include " 3d / CCSprite3D . h " <nl> + # include " 3d / CCMesh . h " <nl> + <nl> / / Audio <nl> # include " audio / include / SimpleAudioEngine . h " <nl> <nl> mmm a / cocos / platform / wp8 / DirectXBase . cpp <nl> ppp b / cocos / platform / wp8 / DirectXBase . cpp <nl> <nl> - # include < wrl / client . h > <nl> + / / XXX : For some reason , this file must not be compiled <nl> + / / XXX : Ask MS why <nl> + # if 0 <nl> + <nl> + # include < wrl / client . h > <nl> # include < d3d11_1 . h > <nl> # include " DirectXBase . h " <nl> <nl> void DirectXBase : : SetDpi ( float dpi ) <nl> / / will not change , and the window resize code will only be executed once . <nl> UpdateForWindowSizeChange ( ) ; <nl> } <nl> - } <nl> \ No newline at end of file <nl> + } <nl> + <nl> + # endif / / 0 <nl> mmm a / cocos / platform / wp8 / DirectXBase . h <nl> ppp b / cocos / platform / wp8 / DirectXBase . h <nl> <nl> - # pragma once <nl> + / / XXX : For some reason , this file must not be compiled <nl> + / / XXX : Ask MS why <nl> + # if 0 <nl> + <nl> + # pragma once <nl> <nl> # include " DirectXHelper . h " <nl> # include < wrl / client . h > <nl> protected private : <nl> Platform : : Agile < Windows : : UI : : Core : : CoreWindow > m_window ; <nl> float m_dpi ; <nl> <nl> - } ; <nl> \ No newline at end of file <nl> + } ; <nl> + <nl> + # endif / / 0 <nl> \ No newline at end of file <nl> mmm a / cocos / renderer / CCGLProgram . cpp <nl> ppp b / cocos / renderer / CCGLProgram . cpp <nl> const char * GLProgram : : SHADER_NAME_LABEL_DISTANCEFIELD_GLOW = " ShaderLabelDFGlow <nl> const char * GLProgram : : SHADER_NAME_LABEL_NORMAL = " ShaderLabelNormal " ; <nl> const char * GLProgram : : SHADER_NAME_LABEL_OUTLINE = " ShaderLabelOutline " ; <nl> <nl> + const char * GLProgram : : SHADER_3D_POSITION = " Shader3DPosition " ; <nl> + const char * GLProgram : : SHADER_3D_POSITION_TEXTURE = " Shader3DPositionTexture " ; <nl> + <nl> <nl> / / uniform names <nl> const char * GLProgram : : UNIFORM_NAME_P_MATRIX = " CC_PMatrix " ; <nl> mmm a / cocos / renderer / CCGLProgram . h <nl> ppp b / cocos / renderer / CCGLProgram . h <nl> class CC_DLL GLProgram : public Ref <nl> static const char * SHADER_NAME_LABEL_DISTANCEFIELD_NORMAL ; <nl> static const char * SHADER_NAME_LABEL_DISTANCEFIELD_GLOW ; <nl> <nl> + / / 3D <nl> + static const char * SHADER_3D_POSITION ; <nl> + static const char * SHADER_3D_POSITION_TEXTURE ; <nl> <nl> / / uniform names <nl> static const char * UNIFORM_NAME_P_MATRIX ; <nl> mmm a / cocos / renderer / CCGLProgramCache . cpp <nl> ppp b / cocos / renderer / CCGLProgramCache . cpp <nl> enum { <nl> kShaderType_LabelDistanceFieldGlow , <nl> kShaderType_LabelNormal , <nl> kShaderType_LabelOutline , <nl> + kShaderType_3DPosition , <nl> + kShaderType_3DPositionTex , <nl> kShaderType_MAX , <nl> } ; <nl> <nl> void GLProgramCache : : loadDefaultGLPrograms ( ) <nl> p = new GLProgram ( ) ; <nl> loadDefaultGLProgram ( p , kShaderType_LabelOutline ) ; <nl> _programs . insert ( std : : make_pair ( GLProgram : : SHADER_NAME_LABEL_OUTLINE , p ) ) ; <nl> + <nl> + p = new GLProgram ( ) ; <nl> + loadDefaultGLProgram ( p , kShaderType_3DPosition ) ; <nl> + _programs . insert ( std : : make_pair ( GLProgram : : SHADER_3D_POSITION , p ) ) ; <nl> + <nl> + p = new GLProgram ( ) ; <nl> + loadDefaultGLProgram ( p , kShaderType_3DPositionTex ) ; <nl> + _programs . insert ( std : : make_pair ( GLProgram : : SHADER_3D_POSITION_TEXTURE , p ) ) ; <nl> + <nl> } <nl> <nl> void GLProgramCache : : reloadDefaultGLPrograms ( ) <nl> void GLProgramCache : : reloadDefaultGLPrograms ( ) <nl> p = getGLProgram ( GLProgram : : SHADER_NAME_LABEL_OUTLINE ) ; <nl> p - > reset ( ) ; <nl> loadDefaultGLProgram ( p , kShaderType_LabelOutline ) ; <nl> + <nl> + p = getGLProgram ( GLProgram : : SHADER_3D_POSITION ) ; <nl> + p - > reset ( ) ; <nl> + loadDefaultGLProgram ( p , kShaderType_3DPosition ) ; <nl> + <nl> + p = getGLProgram ( GLProgram : : SHADER_3D_POSITION_TEXTURE ) ; <nl> + p - > reset ( ) ; <nl> + loadDefaultGLProgram ( p , kShaderType_3DPositionTex ) ; <nl> + <nl> } <nl> <nl> void GLProgramCache : : loadDefaultGLProgram ( GLProgram * p , int type ) <nl> void GLProgramCache : : loadDefaultGLProgram ( GLProgram * p , int type ) <nl> case kShaderType_LabelOutline : <nl> p - > initWithByteArrays ( ccLabel_vert , ccLabelOutline_frag ) ; <nl> break ; <nl> + case kShaderType_3DPosition : <nl> + p - > initWithByteArrays ( cc3D_PositionTex_vert , cc3D_Color_frag ) ; <nl> + break ; <nl> + case kShaderType_3DPositionTex : <nl> + p - > initWithByteArrays ( cc3D_PositionTex_vert , cc3D_ColorTex_frag ) ; <nl> + break ; <nl> default : <nl> CCLOG ( " cocos2d : % s : % d , error shader type " , __FUNCTION__ , __LINE__ ) ; <nl> return ; <nl> new file mode 100644 <nl> index 000000000000 . . 974fecfcc018 <nl> mmm / dev / null <nl> ppp b / cocos / renderer / CCMeshCommand . cpp <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2013 - 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # include " base / ccMacros . h " <nl> + # include " base / CCDirector . h " <nl> + # include " renderer / CCMeshCommand . h " <nl> + # include " renderer / ccGLStateCache . h " <nl> + # include " renderer / CCGLProgramState . h " <nl> + # include " renderer / CCRenderer . h " <nl> + # include " renderer / CCTextureAtlas . h " <nl> + # include " renderer / CCTexture2D . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + MeshCommand : : MeshCommand ( ) <nl> + : _textureID ( 0 ) <nl> + , _blendType ( BlendFunc : : DISABLE ) <nl> + , _glProgramState ( nullptr ) <nl> + , _cullFaceEnabled ( false ) <nl> + , _cullFace ( GL_BACK ) <nl> + , _depthTestEnabled ( false ) <nl> + , _depthWriteEnabled ( false ) <nl> + , _displayColor ( 1 . 0f , 1 . 0f , 1 . 0f , 1 . 0f ) <nl> + { <nl> + _type = RenderCommand : : Type : : MESH_COMMAND ; <nl> + } <nl> + <nl> + void MeshCommand : : init ( float globalOrder , <nl> + GLuint textureID , <nl> + GLProgramState * glProgramState , <nl> + BlendFunc blendType , <nl> + GLuint vertexBuffer , <nl> + GLuint indexBuffer , <nl> + GLenum primitive , <nl> + GLenum indexFormat , <nl> + ssize_t indexCount , <nl> + const Mat4 & mv ) <nl> + { <nl> + CCASSERT ( glProgramState , " GLProgramState cannot be nill " ) ; <nl> + <nl> + _globalOrder = globalOrder ; <nl> + _textureID = textureID ; <nl> + _blendType = blendType ; <nl> + _glProgramState = glProgramState ; <nl> + <nl> + _vertexBuffer = vertexBuffer ; <nl> + _indexBuffer = indexBuffer ; <nl> + _primitive = primitive ; <nl> + _indexFormat = indexFormat ; <nl> + _indexCount = indexCount ; <nl> + _mv = mv ; <nl> + } <nl> + <nl> + void MeshCommand : : setCullFaceEnabled ( bool enable ) <nl> + { <nl> + _cullFaceEnabled = enable ; <nl> + } <nl> + <nl> + void MeshCommand : : setCullFace ( GLenum cullFace ) <nl> + { <nl> + _cullFace = cullFace ; <nl> + } <nl> + <nl> + void MeshCommand : : setDepthTestEnabled ( bool enable ) <nl> + { <nl> + _depthTestEnabled = enable ; <nl> + } <nl> + <nl> + void MeshCommand : : setDepthWriteEnabled ( bool enable ) <nl> + { <nl> + _depthWriteEnabled = enable ; <nl> + } <nl> + <nl> + void MeshCommand : : setDisplayColor ( const Vec4 & color ) <nl> + { <nl> + _displayColor = color ; <nl> + } <nl> + <nl> + MeshCommand : : ~ MeshCommand ( ) <nl> + { <nl> + } <nl> + <nl> + void MeshCommand : : applyRenderState ( ) <nl> + { <nl> + if ( _cullFaceEnabled ) <nl> + { <nl> + glEnable ( GL_CULL_FACE ) ; <nl> + glCullFace ( _cullFace ) ; <nl> + } <nl> + if ( _depthTestEnabled ) <nl> + { <nl> + glEnable ( GL_DEPTH_TEST ) ; <nl> + } <nl> + if ( _depthWriteEnabled ) <nl> + { <nl> + glDepthMask ( GL_TRUE ) ; <nl> + } <nl> + } <nl> + <nl> + void MeshCommand : : restoreRenderState ( ) <nl> + { <nl> + if ( _cullFaceEnabled ) <nl> + { <nl> + glDisable ( GL_CULL_FACE ) ; <nl> + } <nl> + if ( _depthTestEnabled ) <nl> + { <nl> + glDisable ( GL_DEPTH_TEST ) ; <nl> + } <nl> + if ( _depthWriteEnabled ) <nl> + { <nl> + glDepthMask ( GL_FALSE ) ; <nl> + } <nl> + } <nl> + <nl> + void MeshCommand : : execute ( ) <nl> + { <nl> + / / set render state <nl> + applyRenderState ( ) ; <nl> + <nl> + / / Set material <nl> + GL : : bindTexture2D ( _textureID ) ; <nl> + GL : : blendFunc ( _blendType . src , _blendType . dst ) ; <nl> + <nl> + glBindBuffer ( GL_ARRAY_BUFFER , _vertexBuffer ) ; <nl> + _glProgramState - > setUniformVec4 ( " u_color " , _displayColor ) ; <nl> + _glProgramState - > apply ( _mv ) ; <nl> + <nl> + glBindBuffer ( GL_ELEMENT_ARRAY_BUFFER , _indexBuffer ) ; <nl> + <nl> + / / Draw <nl> + glDrawElements ( _primitive , ( GLsizei ) _indexCount , _indexFormat , 0 ) ; <nl> + <nl> + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES ( 1 , _indexCount ) ; <nl> + <nl> + / / restore render state <nl> + restoreRenderState ( ) ; <nl> + <nl> + glBindBuffer ( GL_ELEMENT_ARRAY_BUFFER , 0 ) ; <nl> + glBindBuffer ( GL_ARRAY_BUFFER , 0 ) ; <nl> + } <nl> + <nl> + NS_CC_END <nl> \ No newline at end of file <nl> new file mode 100644 <nl> index 000000000000 . . b99793f40ce4 <nl> mmm / dev / null <nl> ppp b / cocos / renderer / CCMeshCommand . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2013 - 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # ifndef _CC_MESHCOMMAND_H_ <nl> + # define _CC_MESHCOMMAND_H_ <nl> + <nl> + # include " CCRenderCommand . h " <nl> + # include " renderer / CCGLProgram . h " <nl> + # include " math / CCMath . h " <nl> + # include " CCRenderCommandPool . h " <nl> + <nl> + NS_CC_BEGIN <nl> + <nl> + class GLProgramState ; <nl> + <nl> + / / it is a common mesh <nl> + class MeshCommand : public RenderCommand <nl> + { <nl> + public : <nl> + <nl> + MeshCommand ( ) ; <nl> + ~ MeshCommand ( ) ; <nl> + <nl> + void init ( float globalOrder , GLuint textureID , GLProgramState * glProgramState , BlendFunc blendType , GLuint vertexBuffer , GLuint indexBuffer , GLenum primitive , GLenum indexType , ssize_t indexCount , const Mat4 & mv ) ; <nl> + <nl> + void setCullFaceEnabled ( bool enable ) ; <nl> + <nl> + void setCullFace ( GLenum cullFace ) ; <nl> + <nl> + void setDepthTestEnabled ( bool enable ) ; <nl> + <nl> + void setDepthWriteEnabled ( bool enable ) ; <nl> + <nl> + void setDisplayColor ( const Vec4 & color ) ; <nl> + <nl> + void execute ( ) ; <nl> + <nl> + protected : <nl> + / / apply renderstate <nl> + void applyRenderState ( ) ; <nl> + <nl> + / / restore to all false <nl> + void restoreRenderState ( ) ; <nl> + <nl> + GLuint _textureID ; <nl> + GLProgramState * _glProgramState ; <nl> + BlendFunc _blendType ; <nl> + <nl> + GLuint _textrueID ; <nl> + <nl> + Vec4 _displayColor ; / / in order to support tint and fade in fade out <nl> + <nl> + GLuint _vertexBuffer ; <nl> + GLuint _indexBuffer ; <nl> + GLenum _primitive ; <nl> + GLenum _indexFormat ; <nl> + ssize_t _indexCount ; <nl> + <nl> + / / States , default value all false <nl> + bool _cullFaceEnabled ; <nl> + GLenum _cullFace ; <nl> + bool _depthTestEnabled ; <nl> + bool _depthWriteEnabled ; <nl> + <nl> + / / ModelView transform <nl> + Mat4 _mv ; <nl> + } ; <nl> + NS_CC_END <nl> + <nl> + # endif / / _CC_MESHCOMMAND_H_ <nl> mmm a / cocos / renderer / CCRenderCommand . h <nl> ppp b / cocos / renderer / CCRenderCommand . h <nl> class RenderCommand <nl> CUSTOM_COMMAND , <nl> BATCH_COMMAND , <nl> GROUP_COMMAND , <nl> + MESH_COMMAND , <nl> } ; <nl> <nl> / * * Get Render Command Id * / <nl> mmm a / cocos / renderer / CCRenderer . cpp <nl> ppp b / cocos / renderer / CCRenderer . cpp <nl> <nl> # include " renderer / CCGroupCommand . h " <nl> # include " renderer / CCGLProgramCache . h " <nl> # include " renderer / ccGLStateCache . h " <nl> + # include " renderer / CCMeshCommand . h " <nl> # include " base / CCConfiguration . h " <nl> # include " base / CCDirector . h " <nl> # include " base / CCEventDispatcher . h " <nl> void Renderer : : visitRenderQueue ( const RenderQueue & queue ) <nl> auto cmd = static_cast < BatchCommand * > ( command ) ; <nl> cmd - > execute ( ) ; <nl> } <nl> + else if ( RenderCommand : : Type : : MESH_COMMAND = = commandType ) <nl> + { <nl> + flush ( ) ; <nl> + auto cmd = static_cast < MeshCommand * > ( command ) ; <nl> + cmd - > execute ( ) ; <nl> + } <nl> else <nl> { <nl> CCLOGERROR ( " Unknown commands in renderQueue " ) ; <nl> mmm a / cocos / renderer / CMakeLists . txt <nl> ppp b / cocos / renderer / CMakeLists . txt <nl> <nl> set ( COCOS_RENDERER_SRC <nl> renderer / CCBatchCommand . cpp <nl> renderer / CCCustomCommand . cpp <nl> + renderer / CCMeshCommand . cpp <nl> renderer / CCGLProgramCache . cpp <nl> renderer / CCGLProgram . cpp <nl> renderer / CCGLProgramStateCache . cpp <nl> new file mode 100644 <nl> index 000000000000 . . d5f5913f9705 <nl> mmm / dev / null <nl> ppp b / cocos / renderer / ccShader_3D_Color . frag <nl> <nl> + <nl> + const char * cc3D_Color_frag = STRINGIFY ( <nl> + <nl> + \ n # ifdef GL_ES \ n <nl> + varying lowp vec4 DestinationColor ; <nl> + \ n # else \ n <nl> + varying vec4 DestinationColor ; <nl> + \ n # endif \ n <nl> + uniform vec4 u_color ; <nl> + <nl> + void main ( void ) <nl> + { <nl> + gl_FragColor = u_color ; <nl> + } <nl> + ) ; <nl> new file mode 100644 <nl> index 000000000000 . . d7465c901366 <nl> mmm / dev / null <nl> ppp b / cocos / renderer / ccShader_3D_ColorTex . frag <nl> <nl> + <nl> + const char * cc3D_ColorTex_frag = STRINGIFY ( <nl> + <nl> + \ n # ifdef GL_ES \ n <nl> + varying mediump vec2 TextureCoordOut ; <nl> + \ n # else \ n <nl> + varying vec2 TextureCoordOut ; <nl> + \ n # endif \ n <nl> + uniform vec4 u_color ; <nl> + <nl> + void main ( void ) <nl> + { <nl> + gl_FragColor = texture2D ( CC_Texture0 , TextureCoordOut ) * u_color ; <nl> + } <nl> + ) ; <nl> new file mode 100644 <nl> index 000000000000 . . 0cc61a9643c2 <nl> mmm / dev / null <nl> ppp b / cocos / renderer / ccShader_3D_PositionTex . vert <nl> <nl> + <nl> + const char * cc3D_PositionTex_vert = STRINGIFY ( <nl> + <nl> + attribute vec4 a_position ; <nl> + attribute vec2 a_texCoord ; <nl> + <nl> + varying vec2 TextureCoordOut ; <nl> + <nl> + void main ( void ) <nl> + { <nl> + gl_Position = CC_MVPMatrix * a_position ; <nl> + TextureCoordOut = a_texCoord ; <nl> + TextureCoordOut . y = 1 . 0 - TextureCoordOut . y ; <nl> + } <nl> + ) ; <nl> mmm a / cocos / renderer / ccShaders . cpp <nl> ppp b / cocos / renderer / ccShaders . cpp <nl> NS_CC_BEGIN <nl> # include " ccShader_Label_normal . frag " <nl> # include " ccShader_Label_outline . frag " <nl> <nl> + / / <nl> + # include " ccShader_3D_PositionTex . vert " <nl> + # include " ccShader_3D_Color . frag " <nl> + # include " ccShader_3D_ColorTex . frag " <nl> + <nl> NS_CC_END <nl> mmm a / cocos / renderer / ccShaders . h <nl> ppp b / cocos / renderer / ccShaders . h <nl> extern CC_DLL const GLchar * ccLabelOutline_frag ; <nl> <nl> extern CC_DLL const GLchar * ccLabel_vert ; <nl> <nl> + extern CC_DLL const GLchar * cc3D_PositionTex_vert ; <nl> + extern CC_DLL const GLchar * cc3D_ColorTex_frag ; <nl> + extern CC_DLL const GLchar * cc3D_Color_frag ; <nl> / / end of shaders group <nl> / / / @ } <nl> <nl> mmm a / templates / cocos2dx_files . json <nl> ppp b / templates / cocos2dx_files . json <nl> <nl> " cocos / 2d / cocos2d_wp8 . vcxproj " , <nl> " cocos / 2d / cocos2d_wp8 . vcxproj . filters " , <nl> " cocos / 2d / cocos2d_wp8_headers . props " , <nl> - " cocos / 2d / cocos2dx . props " , <nl> + " cocos / 2d / cocos2dx . props " , <nl> + " cocos / 3d / CMakeLists . txt " , <nl> + " cocos / 3d / CCSprite3DDataCache . h " , <nl> + " cocos / 3d / CCSprite3DDataCache . cpp " , <nl> + " cocos / 3d / CCSprite3D . h " , <nl> + " cocos / 3d / CCSprite3D . cpp " , <nl> + " cocos / 3d / CCObjLoader . h " , <nl> + " cocos / 3d / CCObjLoader . cpp " , <nl> + " cocos / 3d / CCMesh . h " , <nl> + " cocos / 3d / CCMesh . cpp " , <nl> " cocos / Android . mk " , <nl> " cocos / CMakeLists . txt " , <nl> " cocos / audio / CMakeLists . txt " , <nl> <nl> " cocos / platform / wp8 / shaders / precompiledshaders . h " , <nl> " cocos / renderer / CCBatchCommand . cpp " , <nl> " cocos / renderer / CCBatchCommand . h " , <nl> + " cocos / renderer / CCMeshCommand . h " , <nl> + " cocos / renderer / CCMeshCommand . cpp " , <nl> " cocos / renderer / CCCustomCommand . cpp " , <nl> " cocos / renderer / CCCustomCommand . h " , <nl> " cocos / renderer / CCGLProgram . cpp " , <nl> <nl> " cocos / renderer / CMakeLists . txt " , <nl> " cocos / renderer / ccGLStateCache . cpp " , <nl> " cocos / renderer / ccGLStateCache . h " , <nl> + " cocos / renderer / ccShader_3D_Color . frag " , <nl> + " cocos / renderer / ccShader_3D_ColorTex . frag " , <nl> + " cocos / renderer / ccShader_3D_PositionTex . vert " , <nl> " cocos / renderer / ccShader_Label . vert " , <nl> " cocos / renderer / ccShader_Label_df . frag " , <nl> " cocos / renderer / ccShader_Label_df_glow . frag " , <nl> mmm a / tests / cpp - empty - test / proj - wp8 - xaml / cpp - empty - test / cpp - empty - test . csproj <nl> ppp b / tests / cpp - empty - test / proj - wp8 - xaml / cpp - empty - test / cpp - empty - test . csproj <nl> <nl> < WarningLevel > 4 < / WarningLevel > <nl> < / PropertyGroup > <nl> < ItemGroup > <nl> - < Compile Include = " App . xaml . cs " / > <nl> - < Compile Include = " EditBox . xaml . cs " / > <nl> + < Compile Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ App . xaml . cs " > <nl> + < Link > App . xaml . cs < / Link > <nl> + < / Compile > <nl> + < Compile Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ EditBox . xaml . cs " > <nl> + < Link > EditBox . xaml . cs < / Link > <nl> + < / Compile > <nl> + < Compile Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ MainPage . xaml . cs " > <nl> + < Link > MainPage . xaml . cs < / Link > <nl> + < / Compile > <nl> < Compile Include = " LocalizedStrings . cs " / > <nl> - < Compile Include = " MainPage . xaml . cs " / > <nl> < Compile Include = " Properties \ AssemblyInfo . cs " / > <nl> < Compile Include = " Resources \ AppResources . Designer . cs " > <nl> < AutoGen > True < / AutoGen > <nl> <nl> < / Content > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> - < Page Include = " App . xaml " > <nl> + < Page Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ App . xaml " > <nl> + < Link > App . xaml < / Link > <nl> < Generator > MSBuild : Compile < / Generator > <nl> < SubType > Designer < / SubType > <nl> < / Page > <nl> - < Page Include = " EditBox . xaml " > <nl> + < Page Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ EditBox . xaml " > <nl> + < Link > EditBox . xaml < / Link > <nl> < Generator > MSBuild : Compile < / Generator > <nl> < SubType > Designer < / SubType > <nl> < / Page > <nl> - < Page Include = " MainPage . xaml " > <nl> + < Page Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ MainPage . xaml " > <nl> + < Link > MainPage . xaml < / Link > <nl> < Generator > MSBuild : Compile < / Generator > <nl> < SubType > Designer < / SubType > <nl> < / Page > <nl> mmm a / tests / cpp - tests / Android . mk <nl> ppp b / tests / cpp - tests / Android . mk <nl> Classes / ShaderTest / ShaderTest . cpp \ <nl> Classes / ShaderTest / ShaderTest2 . cpp \ <nl> Classes / SpineTest / SpineTest . cpp \ <nl> Classes / SpriteTest / SpriteTest . cpp \ <nl> + Classes / Sprite3DTest / Sprite3DTest . cpp \ <nl> Classes / TextInputTest / TextInputTest . cpp \ <nl> Classes / Texture2dTest / Texture2dTest . cpp \ <nl> Classes / TextureCacheTest / TextureCacheTest . cpp \ <nl> mmm a / tests / cpp - tests / CMakeLists . txt <nl> ppp b / tests / cpp - tests / CMakeLists . txt <nl> set ( SAMPLE_SRC <nl> Classes / ShaderTest / ShaderTest . cpp <nl> Classes / ShaderTest / ShaderTest2 . cpp <nl> Classes / SpriteTest / SpriteTest . cpp <nl> + Classes / Sprite3DTest / Sprite3DTest . cpp <nl> Classes / TextInputTest / TextInputTest . cpp <nl> Classes / Texture2dTest / Texture2dTest . cpp <nl> Classes / TexturePackerEncryptionTest / TextureAtlasEncryptionTest . cpp <nl> new file mode 100644 <nl> index 000000000000 . . 1554538efbef <nl> mmm / dev / null <nl> ppp b / tests / cpp - tests / Classes / Sprite3DTest / Sprite3DTest . cpp <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2012 cocos2d - x . org <nl> + Copyright ( c ) 2013 - 2014 Chukong Technologies Inc . <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # include " Sprite3DTest . h " <nl> + <nl> + # include < algorithm > <nl> + # include " . . / testResource . h " <nl> + <nl> + enum <nl> + { <nl> + IDC_NEXT = 100 , <nl> + IDC_BACK , <nl> + IDC_RESTART <nl> + } ; <nl> + <nl> + static int sceneIdx = - 1 ; <nl> + <nl> + <nl> + static std : : function < Layer * ( ) > createFunctions [ ] = <nl> + { <nl> + CL ( Sprite3DBasicTest ) , <nl> + CL ( Sprite3DEffectTest ) <nl> + } ; <nl> + <nl> + # define MAX_LAYER ( sizeof ( createFunctions ) / sizeof ( createFunctions [ 0 ] ) ) <nl> + <nl> + static Layer * nextSpriteTestAction ( ) <nl> + { <nl> + sceneIdx + + ; <nl> + sceneIdx = sceneIdx % MAX_LAYER ; <nl> + <nl> + auto layer = ( createFunctions [ sceneIdx ] ) ( ) ; <nl> + return layer ; <nl> + } <nl> + <nl> + static Layer * backSpriteTestAction ( ) <nl> + { <nl> + sceneIdx - - ; <nl> + int total = MAX_LAYER ; <nl> + if ( sceneIdx < 0 ) <nl> + sceneIdx + = total ; <nl> + <nl> + auto layer = ( createFunctions [ sceneIdx ] ) ( ) ; <nl> + return layer ; <nl> + } <nl> + <nl> + static Layer * restartSpriteTestAction ( ) <nl> + { <nl> + auto layer = ( createFunctions [ sceneIdx ] ) ( ) ; <nl> + return layer ; <nl> + } <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + / / <nl> + / / SpriteTestDemo <nl> + / / <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + <nl> + Sprite3DTestDemo : : Sprite3DTestDemo ( void ) <nl> + : BaseTest ( ) <nl> + { <nl> + } <nl> + <nl> + Sprite3DTestDemo : : ~ Sprite3DTestDemo ( void ) <nl> + { <nl> + } <nl> + <nl> + std : : string Sprite3DTestDemo : : title ( ) const <nl> + { <nl> + return " No title " ; <nl> + } <nl> + <nl> + std : : string Sprite3DTestDemo : : subtitle ( ) const <nl> + { <nl> + return " " ; <nl> + } <nl> + <nl> + void Sprite3DTestDemo : : onEnter ( ) <nl> + { <nl> + BaseTest : : onEnter ( ) ; <nl> + } <nl> + <nl> + void Sprite3DTestDemo : : restartCallback ( Ref * sender ) <nl> + { <nl> + auto s = new Sprite3DTestScene ( ) ; <nl> + s - > addChild ( restartSpriteTestAction ( ) ) ; <nl> + <nl> + Director : : getInstance ( ) - > replaceScene ( s ) ; <nl> + s - > release ( ) ; <nl> + } <nl> + <nl> + void Sprite3DTestDemo : : nextCallback ( Ref * sender ) <nl> + { <nl> + auto s = new Sprite3DTestScene ( ) ; <nl> + s - > addChild ( nextSpriteTestAction ( ) ) ; <nl> + Director : : getInstance ( ) - > replaceScene ( s ) ; <nl> + s - > release ( ) ; <nl> + } <nl> + <nl> + void Sprite3DTestDemo : : backCallback ( Ref * sender ) <nl> + { <nl> + auto s = new Sprite3DTestScene ( ) ; <nl> + s - > addChild ( backSpriteTestAction ( ) ) ; <nl> + Director : : getInstance ( ) - > replaceScene ( s ) ; <nl> + s - > release ( ) ; <nl> + } <nl> + <nl> + <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + / / <nl> + / / Sprite3DBasicTest <nl> + / / <nl> + / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> + <nl> + Sprite3DBasicTest : : Sprite3DBasicTest ( ) <nl> + { <nl> + auto listener = EventListenerTouchAllAtOnce : : create ( ) ; <nl> + listener - > onTouchesEnded = CC_CALLBACK_2 ( Sprite3DBasicTest : : onTouchesEnded , this ) ; <nl> + _eventDispatcher - > addEventListenerWithSceneGraphPriority ( listener , this ) ; <nl> + <nl> + auto s = Director : : getInstance ( ) - > getWinSize ( ) ; <nl> + addNewSpriteWithCoords ( Vec2 ( s . width / 2 , s . height / 2 ) ) ; <nl> + } <nl> + <nl> + void Sprite3DBasicTest : : addNewSpriteWithCoords ( Vec2 p ) <nl> + { <nl> + / / int idx = ( int ) ( CCRANDOM_0_1 ( ) * 1400 . 0f / 100 . 0f ) ; <nl> + / / int x = ( idx % 5 ) * 85 ; <nl> + / / int y = ( idx / 5 ) * 121 ; <nl> + <nl> + / / / / option 1 : load a obj that contain the texture in it <nl> + / / auto sprite = Sprite3D : : create ( " sprite3dTest / scene01 . obj " ) ; <nl> + <nl> + / / option 2 : load obj and assign the texture <nl> + auto sprite = Sprite3D : : create ( " Sprite3DTest / boss1 . obj " ) ; <nl> + sprite - > setScale ( 3 . f ) ; <nl> + sprite - > setTexture ( " Sprite3DTest / boss . png " ) ; <nl> + <nl> + / / <nl> + / / sprite - > setEffect ( cocos2d : : EFFECT_OUTLINE ) ; <nl> + <nl> + / / add to scene <nl> + addChild ( sprite ) ; <nl> + <nl> + sprite - > setPosition ( Vec2 ( p . x , p . y ) ) ; <nl> + <nl> + ActionInterval * action ; <nl> + float random = CCRANDOM_0_1 ( ) ; <nl> + <nl> + if ( random < 0 . 20 ) <nl> + action = ScaleBy : : create ( 3 , 2 ) ; <nl> + else if ( random < 0 . 40 ) <nl> + action = RotateBy : : create ( 3 , 360 ) ; <nl> + else if ( random < 0 . 60 ) <nl> + action = Blink : : create ( 1 , 3 ) ; <nl> + else if ( random < 0 . 8 ) <nl> + action = TintBy : : create ( 2 , 0 , - 255 , - 255 ) ; <nl> + else <nl> + action = FadeOut : : create ( 2 ) ; <nl> + auto action_back = action - > reverse ( ) ; <nl> + auto seq = Sequence : : create ( action , action_back , NULL ) ; <nl> + <nl> + sprite - > runAction ( RepeatForever : : create ( seq ) ) ; <nl> + } <nl> + <nl> + void Sprite3DBasicTest : : onTouchesEnded ( const std : : vector < Touch * > & touches , Event * event ) <nl> + { <nl> + for ( auto touch : touches ) <nl> + { <nl> + auto location = touch - > getLocation ( ) ; <nl> + <nl> + addNewSpriteWithCoords ( location ) ; <nl> + } <nl> + } <nl> + <nl> + std : : string Sprite3DBasicTest : : title ( ) const <nl> + { <nl> + return " Testing Sprite3D " ; <nl> + } <nl> + <nl> + std : : string Sprite3DBasicTest : : subtitle ( ) const <nl> + { <nl> + return " Tap screen to add more sprites " ; <nl> + } <nl> + <nl> + void Sprite3DTestScene : : runThisTest ( ) <nl> + { <nl> + auto layer = nextSpriteTestAction ( ) ; <nl> + addChild ( layer ) ; <nl> + <nl> + Director : : getInstance ( ) - > replaceScene ( this ) ; <nl> + } <nl> + <nl> + static int tuple_sort ( const std : : tuple < ssize_t , Effect3D * , CustomCommand > & tuple1 , const std : : tuple < ssize_t , Effect3D * , CustomCommand > & tuple2 ) <nl> + { <nl> + return std : : get < 0 > ( tuple1 ) < std : : get < 0 > ( tuple2 ) ; <nl> + } <nl> + <nl> + EffectSprite3D * EffectSprite3D : : createFromObjFileAndTexture ( const std : : string & objFilePath , const std : : string & textureFilePath ) <nl> + { <nl> + auto sprite = new EffectSprite3D ( ) ; <nl> + if ( sprite & & sprite - > initWithFile ( objFilePath ) ) <nl> + { <nl> + sprite - > autorelease ( ) ; <nl> + sprite - > setTexture ( textureFilePath ) ; <nl> + return sprite ; <nl> + } <nl> + CC_SAFE_DELETE ( sprite ) ; <nl> + return nullptr ; <nl> + } <nl> + <nl> + EffectSprite3D : : EffectSprite3D ( ) <nl> + : _defaultEffect ( nullptr ) <nl> + { <nl> + <nl> + } <nl> + <nl> + EffectSprite3D : : ~ EffectSprite3D ( ) <nl> + { <nl> + for ( auto effect : _effects ) <nl> + { <nl> + CC_SAFE_RELEASE_NULL ( std : : get < 1 > ( effect ) ) ; <nl> + } <nl> + CC_SAFE_RELEASE ( _defaultEffect ) ; <nl> + } <nl> + <nl> + void EffectSprite3D : : setEffect3D ( Effect3D * effect ) <nl> + { <nl> + if ( _defaultEffect = = effect ) return ; <nl> + CC_SAFE_RETAIN ( effect ) ; <nl> + CC_SAFE_RELEASE ( _defaultEffect ) ; <nl> + _defaultEffect = effect ; <nl> + } <nl> + <nl> + void EffectSprite3D : : addEffect ( Effect3DOutline * effect , ssize_t order ) <nl> + { <nl> + if ( nullptr = = effect ) return ; <nl> + effect - > retain ( ) ; <nl> + <nl> + _effects . push_back ( std : : make_tuple ( order , effect , CustomCommand ( ) ) ) ; <nl> + <nl> + std : : sort ( std : : begin ( _effects ) , std : : end ( _effects ) , tuple_sort ) ; <nl> + } <nl> + <nl> + const std : : string Effect3DOutline : : _vertShaderFile = " Shaders3D / OutLine . vert " ; <nl> + const std : : string Effect3DOutline : : _fragShaderFile = " Shaders3D / OutLine . frag " ; <nl> + const std : : string Effect3DOutline : : _keyInGLProgramCache = " Effect3DLibrary_Outline " ; <nl> + GLProgram * Effect3DOutline : : getOrCreateProgram ( ) <nl> + { <nl> + auto program = GLProgramCache : : getInstance ( ) - > getGLProgram ( _keyInGLProgramCache ) ; <nl> + if ( program = = nullptr ) <nl> + { <nl> + program = GLProgram : : createWithFilenames ( _vertShaderFile , _fragShaderFile ) ; <nl> + GLProgramCache : : getInstance ( ) - > addGLProgram ( program , _keyInGLProgramCache ) ; <nl> + } <nl> + return program ; <nl> + } <nl> + <nl> + Effect3DOutline * Effect3DOutline : : create ( ) <nl> + { <nl> + Effect3DOutline * effect = new Effect3DOutline ( ) ; <nl> + if ( effect & & effect - > init ( ) ) <nl> + { <nl> + effect - > autorelease ( ) ; <nl> + return effect ; <nl> + } <nl> + else <nl> + { <nl> + CC_SAFE_DELETE ( effect ) ; <nl> + return nullptr ; <nl> + } <nl> + } <nl> + <nl> + bool Effect3DOutline : : init ( ) <nl> + { <nl> + <nl> + GLProgram * glprogram = Effect3DOutline : : getOrCreateProgram ( ) ; <nl> + if ( nullptr = = glprogram ) <nl> + { <nl> + CC_SAFE_DELETE ( glprogram ) ; <nl> + return false ; <nl> + } <nl> + _glProgramState = GLProgramState : : create ( glprogram ) ; <nl> + if ( nullptr = = _glProgramState ) <nl> + { <nl> + return false ; <nl> + } <nl> + _glProgramState - > retain ( ) ; <nl> + _glProgramState - > setUniformVec3 ( " OutLineColor " , _outlineColor ) ; <nl> + _glProgramState - > setUniformFloat ( " OutlineWidth " , _outlineWidth ) ; <nl> + <nl> + return true ; <nl> + } <nl> + <nl> + Effect3DOutline : : Effect3DOutline ( ) <nl> + : _outlineWidth ( 1 . 0f ) <nl> + , _outlineColor ( 1 , 1 , 1 ) <nl> + { <nl> + <nl> + } <nl> + <nl> + Effect3DOutline : : ~ Effect3DOutline ( ) <nl> + { <nl> + } <nl> + <nl> + void Effect3DOutline : : setOutlineColor ( const Vec3 & color ) <nl> + { <nl> + if ( _outlineColor ! = color ) <nl> + { <nl> + _outlineColor = color ; <nl> + _glProgramState - > setUniformVec3 ( " OutLineColor " , _outlineColor ) ; <nl> + } <nl> + } <nl> + <nl> + void Effect3DOutline : : setOutlineWidth ( float width ) <nl> + { <nl> + if ( _outlineWidth ! = width ) <nl> + { <nl> + _outlineWidth = width ; <nl> + _glProgramState - > setUniformFloat ( " OutlineWidth " , _outlineWidth ) ; <nl> + } <nl> + } <nl> + <nl> + void Effect3DOutline : : drawWithSprite ( EffectSprite3D * sprite , const Mat4 & transform ) <nl> + { <nl> + auto mesh = sprite - > getMesh ( ) ; <nl> + long offset = 0 ; <nl> + for ( auto i = 0 ; i < mesh - > getMeshVertexAttribCount ( ) ; i + + ) <nl> + { <nl> + auto meshvertexattrib = mesh - > getMeshVertexAttribute ( i ) ; <nl> + <nl> + _glProgramState - > setVertexAttribPointer ( s_attributeNames [ meshvertexattrib . vertexAttrib ] , <nl> + meshvertexattrib . size , <nl> + meshvertexattrib . type , <nl> + GL_FALSE , <nl> + mesh - > getVertexSizeInBytes ( ) , <nl> + ( void * ) offset ) ; <nl> + offset + = meshvertexattrib . attribSizeBytes ; <nl> + } <nl> + / / draw <nl> + { <nl> + glEnable ( GL_CULL_FACE ) ; <nl> + glCullFace ( GL_FRONT ) ; <nl> + glEnable ( GL_DEPTH_TEST ) ; <nl> + Color4F color ( sprite - > getDisplayedColor ( ) ) ; <nl> + color . a = sprite - > getDisplayedOpacity ( ) / 255 . 0f ; <nl> + <nl> + _glProgramState - > setUniformVec4 ( " u_color " , Vec4 ( color . r , color . g , color . b , color . a ) ) ; <nl> + <nl> + auto mesh = sprite - > getMesh ( ) ; <nl> + glBindBuffer ( GL_ARRAY_BUFFER , mesh - > getVertexBuffer ( ) ) ; <nl> + _glProgramState - > apply ( transform ) ; <nl> + glBindBuffer ( GL_ELEMENT_ARRAY_BUFFER , mesh - > getIndexBuffer ( ) ) ; <nl> + glDrawElements ( ( GLenum ) mesh - > getPrimitiveType ( ) , mesh - > getIndexCount ( ) , ( GLenum ) mesh - > getIndexFormat ( ) , 0 ) ; <nl> + glBindBuffer ( GL_ELEMENT_ARRAY_BUFFER , 0 ) ; <nl> + glBindBuffer ( GL_ARRAY_BUFFER , 0 ) ; <nl> + glDisable ( GL_DEPTH_TEST ) ; <nl> + glCullFace ( GL_BACK ) ; <nl> + glDisable ( GL_CULL_FACE ) ; <nl> + CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES ( 1 , mesh - > getIndexCount ( ) ) ; <nl> + } <nl> + } <nl> + <nl> + void EffectSprite3D : : draw ( cocos2d : : Renderer * renderer , const cocos2d : : Mat4 & transform , bool transformUpdated ) <nl> + { <nl> + for ( auto & effect : _effects ) <nl> + { <nl> + if ( std : : get < 0 > ( effect ) > = 0 ) <nl> + break ; <nl> + CustomCommand & cc = std : : get < 2 > ( effect ) ; <nl> + cc . func = CC_CALLBACK_0 ( Effect3D : : drawWithSprite , std : : get < 1 > ( effect ) , this , transform ) ; <nl> + renderer - > addCommand ( & cc ) ; <nl> + <nl> + } <nl> + <nl> + if ( ! _defaultEffect ) <nl> + { <nl> + Sprite3D : : draw ( renderer , transform , transformUpdated ) ; <nl> + } <nl> + else <nl> + { <nl> + _command . init ( _globalZOrder ) ; <nl> + _command . func = CC_CALLBACK_0 ( Effect3D : : drawWithSprite , _defaultEffect , this , transform ) ; <nl> + renderer - > addCommand ( & _command ) ; <nl> + } <nl> + <nl> + for ( auto & effect : _effects ) <nl> + { <nl> + if ( std : : get < 0 > ( effect ) < = 0 ) <nl> + continue ; <nl> + CustomCommand & cc = std : : get < 2 > ( effect ) ; <nl> + cc . func = CC_CALLBACK_0 ( Effect3D : : drawWithSprite , std : : get < 1 > ( effect ) , this , transform ) ; <nl> + renderer - > addCommand ( & cc ) ; <nl> + <nl> + } <nl> + } <nl> + <nl> + Sprite3DEffectTest : : Sprite3DEffectTest ( ) <nl> + { <nl> + auto s = Director : : getInstance ( ) - > getWinSize ( ) ; <nl> + addNewSpriteWithCoords ( Vec2 ( s . width / 2 , s . height / 2 ) ) ; <nl> + <nl> + auto listener = EventListenerTouchAllAtOnce : : create ( ) ; <nl> + listener - > onTouchesEnded = CC_CALLBACK_2 ( Sprite3DEffectTest : : onTouchesEnded , this ) ; <nl> + _eventDispatcher - > addEventListenerWithSceneGraphPriority ( listener , this ) ; <nl> + } <nl> + <nl> + std : : string Sprite3DEffectTest : : title ( ) const <nl> + { <nl> + return " Testing Sprite3D " ; <nl> + } <nl> + std : : string Sprite3DEffectTest : : subtitle ( ) const <nl> + { <nl> + return " Sprite3d with effects " ; <nl> + } <nl> + <nl> + void Sprite3DEffectTest : : addNewSpriteWithCoords ( Vec2 p ) <nl> + { <nl> + / / option 2 : load obj and assign the texture <nl> + auto sprite = EffectSprite3D : : createFromObjFileAndTexture ( " Sprite3DTest / boss1 . obj " , " Sprite3DTest / boss . png " ) ; <nl> + Effect3DOutline * effect = Effect3DOutline : : create ( ) ; <nl> + effect - > setOutlineColor ( Vec3 ( 1 , 0 , 0 ) ) ; <nl> + effect - > setOutlineWidth ( 0 . 01f ) ; <nl> + sprite - > addEffect ( effect , - 1 ) ; <nl> + Effect3DOutline * effect2 = Effect3DOutline : : create ( ) ; <nl> + effect2 - > setOutlineWidth ( 0 . 02f ) ; <nl> + effect2 - > setOutlineColor ( Vec3 ( 1 , 1 , 0 ) ) ; <nl> + sprite - > addEffect ( effect2 , - 2 ) ; <nl> + / / sprite - > setEffect3D ( effect ) ; <nl> + sprite - > setScale ( 6 . f ) ; <nl> + <nl> + / / add to scene <nl> + addChild ( sprite ) ; <nl> + <nl> + sprite - > setPosition ( Vec2 ( p . x , p . y ) ) ; <nl> + <nl> + ActionInterval * action ; <nl> + float random = CCRANDOM_0_1 ( ) ; <nl> + <nl> + if ( random < 0 . 20 ) <nl> + action = ScaleBy : : create ( 3 , 2 ) ; <nl> + else if ( random < 0 . 40 ) <nl> + action = RotateBy : : create ( 3 , 360 ) ; <nl> + else if ( random < 0 . 60 ) <nl> + action = Blink : : create ( 1 , 3 ) ; <nl> + else if ( random < 0 . 8 ) <nl> + action = TintBy : : create ( 2 , 0 , - 255 , - 255 ) ; <nl> + else <nl> + action = FadeOut : : create ( 2 ) ; <nl> + auto action_back = action - > reverse ( ) ; <nl> + auto seq = Sequence : : create ( action , action_back , NULL ) ; <nl> + <nl> + sprite - > runAction ( RepeatForever : : create ( seq ) ) ; <nl> + } <nl> + <nl> + void Sprite3DEffectTest : : onTouchesEnded ( const std : : vector < Touch * > & touches , Event * event ) <nl> + { <nl> + for ( auto touch : touches ) <nl> + { <nl> + auto location = touch - > getLocation ( ) ; <nl> + <nl> + addNewSpriteWithCoords ( location ) ; <nl> + } <nl> + } <nl> new file mode 100644 <nl> index 000000000000 . . 20a67bfd9e2d <nl> mmm / dev / null <nl> ppp b / tests / cpp - tests / Classes / Sprite3DTest / Sprite3DTest . h <nl> <nl> + / * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * <nl> + Copyright ( c ) 2013 cocos2d - x . org <nl> + <nl> + http : / / www . cocos2d - x . org <nl> + <nl> + Permission is hereby granted , free of charge , to any person obtaining a copy <nl> + of this software and associated documentation files ( the " Software " ) , to deal <nl> + in the Software without restriction , including without limitation the rights <nl> + to use , copy , modify , merge , publish , distribute , sublicense , and / or sell <nl> + copies of the Software , and to permit persons to whom the Software is <nl> + furnished to do so , subject to the following conditions : <nl> + <nl> + The above copyright notice and this permission notice shall be included in <nl> + all copies or substantial portions of the Software . <nl> + <nl> + THE SOFTWARE IS PROVIDED " AS IS " , WITHOUT WARRANTY OF ANY KIND , EXPRESS OR <nl> + IMPLIED , INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY , <nl> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT . IN NO EVENT SHALL THE <nl> + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM , DAMAGES OR OTHER <nl> + LIABILITY , WHETHER IN AN ACTION OF CONTRACT , TORT OR OTHERWISE , ARISING FROM , <nl> + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN <nl> + THE SOFTWARE . <nl> + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * / <nl> + <nl> + # ifndef _SPRITE3D_TEST_H_ <nl> + # define _SPRITE3D_TEST_H_ <nl> + <nl> + # include " . . / testBasic . h " <nl> + # include " . . / BaseTest . h " <nl> + # include < string > <nl> + <nl> + class Sprite3DTestDemo : public BaseTest <nl> + { <nl> + public : <nl> + Sprite3DTestDemo ( void ) ; <nl> + virtual ~ Sprite3DTestDemo ( void ) ; <nl> + <nl> + void restartCallback ( Ref * sender ) ; <nl> + void nextCallback ( Ref * sender ) ; <nl> + void backCallback ( Ref * sender ) ; <nl> + <nl> + / / overrides <nl> + virtual std : : string title ( ) const override ; <nl> + virtual std : : string subtitle ( ) const override ; <nl> + virtual void onEnter ( ) override ; <nl> + <nl> + protected : <nl> + std : : string _title ; <nl> + } ; <nl> + <nl> + class Sprite3DBasicTest : public Sprite3DTestDemo <nl> + { <nl> + public : <nl> + CREATE_FUNC ( Sprite3DBasicTest ) ; <nl> + Sprite3DBasicTest ( ) ; <nl> + virtual std : : string title ( ) const override ; <nl> + virtual std : : string subtitle ( ) const override ; <nl> + <nl> + void addNewSpriteWithCoords ( Vec2 p ) ; <nl> + void onTouchesEnded ( const std : : vector < Touch * > & touches , Event * event ) ; <nl> + } ; <nl> + <nl> + class EffectSprite3D ; <nl> + <nl> + class Effect3D : public Ref <nl> + { <nl> + public : <nl> + virtual void drawWithSprite ( EffectSprite3D * sprite , const Mat4 & transform ) = 0 ; <nl> + protected : <nl> + Effect3D ( ) : _glProgramState ( nullptr ) { } <nl> + virtual ~ Effect3D ( ) <nl> + { <nl> + CC_SAFE_RELEASE ( _glProgramState ) ; <nl> + } <nl> + protected : <nl> + GLProgramState * _glProgramState ; <nl> + } ; <nl> + <nl> + class Effect3DOutline : public Effect3D <nl> + { <nl> + public : <nl> + static Effect3DOutline * create ( ) ; <nl> + <nl> + void setOutlineColor ( const Vec3 & color ) ; <nl> + <nl> + void setOutlineWidth ( float width ) ; <nl> + <nl> + void drawWithSprite ( EffectSprite3D * sprite , const Mat4 & transform ) ; <nl> + <nl> + protected : <nl> + <nl> + Effect3DOutline ( ) ; <nl> + virtual ~ Effect3DOutline ( ) ; <nl> + <nl> + bool init ( ) ; <nl> + <nl> + Vec3 _outlineColor ; <nl> + float _outlineWidth ; <nl> + <nl> + protected : <nl> + static const std : : string _vertShaderFile ; <nl> + static const std : : string _fragShaderFile ; <nl> + static const std : : string _keyInGLProgramCache ; <nl> + static GLProgram * getOrCreateProgram ( ) ; <nl> + } ; <nl> + <nl> + class EffectSprite3D : public Sprite3D <nl> + { <nl> + public : <nl> + static EffectSprite3D * createFromObjFileAndTexture ( const std : : string & objFilePath , const std : : string & textureFilePath ) ; <nl> + void setEffect3D ( Effect3D * effect ) ; <nl> + void addEffect ( Effect3DOutline * effect , ssize_t order ) ; <nl> + virtual void draw ( Renderer * renderer , const Mat4 & transform , bool transformUpdated ) override ; <nl> + protected : <nl> + EffectSprite3D ( ) ; <nl> + virtual ~ EffectSprite3D ( ) ; <nl> + <nl> + std : : vector < std : : tuple < ssize_t , Effect3D * , CustomCommand > > _effects ; <nl> + Effect3D * _defaultEffect ; <nl> + CustomCommand _command ; <nl> + } ; <nl> + <nl> + class Sprite3DEffectTest : public Sprite3DTestDemo <nl> + { <nl> + public : <nl> + CREATE_FUNC ( Sprite3DEffectTest ) ; <nl> + Sprite3DEffectTest ( ) ; <nl> + virtual std : : string title ( ) const override ; <nl> + virtual std : : string subtitle ( ) const override ; <nl> + <nl> + void addNewSpriteWithCoords ( Vec2 p ) ; <nl> + <nl> + void onTouchesEnded ( const std : : vector < Touch * > & touches , Event * event ) ; <nl> + } ; <nl> + <nl> + class Sprite3DTestScene : public TestScene <nl> + { <nl> + public : <nl> + virtual void runThisTest ( ) ; <nl> + } ; <nl> + <nl> + # endif <nl> mmm a / tests / cpp - tests / Classes / controller . cpp <nl> ppp b / tests / cpp - tests / Classes / controller . cpp <nl> Controller g_aTestNames [ ] = { <nl> / / TESTS MUST BE ORDERED ALPHABETICALLY <nl> / / violators will be prosecuted <nl> / / <nl> - { " A new UI " , [ ] ( ) { return new UITestScene ( ) ; } } , <nl> { " Accelerometer " , [ ] ( ) { return new AccelerometerTestScene ( ) ; } } , <nl> { " ActionManager " , [ ] ( ) { return new ActionManagerTestScene ( ) ; } } , <nl> { " Actions - Basic " , [ ] ( ) { return new ActionsTestScene ( ) ; } } , <nl> Controller g_aTestNames [ ] = { <nl> { " Node : Scene " , [ ] ( ) { return new SceneTestScene ( ) ; } } , <nl> { " Node : Spine " , [ ] ( ) { return new SpineTestScene ( ) ; } } , <nl> { " Node : Sprite " , [ ] ( ) { return new SpriteTestScene ( ) ; } } , <nl> + { " Node : Sprite3D " , [ ] ( ) { return new Sprite3DTestScene ( ) ; } } , <nl> { " Node : TileMap " , [ ] ( ) { return new TileMapTestScene ( ) ; } } , <nl> { " Node : Text Input " , [ ] ( ) { return new TextInputTestScene ( ) ; } } , <nl> + { " Node : UI " , [ ] ( ) { return new UITestScene ( ) ; } } , <nl> { " Mouse " , [ ] ( ) { return new MouseTestScene ( ) ; } } , <nl> { " MutiTouch " , [ ] ( ) { return new MutiTouchTestScene ( ) ; } } , <nl> { " Performance tests " , [ ] ( ) { return new PerformanceTestScene ( ) ; } } , <nl> mmm a / tests / cpp - tests / Classes / tests . h <nl> ppp b / tests / cpp - tests / Classes / tests . h <nl> <nl> # include " PhysicsTest / PhysicsTest . h " <nl> # include " ReleasePoolTest / ReleasePoolTest . h " <nl> <nl> + # include " Sprite3DTest / Sprite3DTest . h " <nl> + <nl> # endif <nl> new file mode 100644 <nl> index 000000000000 . . dd6e60a6a712 <nl> mmm / dev / null <nl> ppp b / tests / cpp - tests / Resources / Shaders3D / OutLine . frag <nl> <nl> + uniform vec3 OutLineColor ; <nl> + uniform vec4 u_color ; <nl> + <nl> + void main ( void ) <nl> + { <nl> + gl_FragColor = vec4 ( OutLineColor , 1 . 0 ) * u_color ; <nl> + } <nl> new file mode 100644 <nl> index 000000000000 . . f4cd386b34ab <nl> mmm / dev / null <nl> ppp b / tests / cpp - tests / Resources / Shaders3D / OutLine . vert <nl> <nl> + attribute vec4 a_position ; <nl> + attribute vec3 a_normal ; <nl> + uniform float OutlineWidth ; <nl> + <nl> + void main ( void ) <nl> + { <nl> + vec4 pos = CC_MVPMatrix * a_position ; <nl> + vec4 normalproj = CC_MVPMatrix * vec4 ( a_normal , 0 ) ; <nl> + normalproj = normalize ( normalproj ) ; <nl> + pos . xy + = normalproj . xy * ( OutlineWidth * ( pos . z * 0 . 5 + 0 . 5 ) ) ; <nl> + <nl> + gl_Position = pos ; <nl> + } <nl> new file mode 100644 <nl> index 000000000000 . . 97154a2568c7 <nl> mmm / dev / null <nl> ppp b / tests / cpp - tests / Resources / Sprite3DTest / boss . obj <nl> <nl> + # WaveFront * . obj file ( generated by CINEMA 4D ) <nl> + <nl> + g Object <nl> + v 2 . 152745 1 . 129535 - 2 . 654346 <nl> + v 2 . 018903 1 . 184975 - 2 . 654349 <nl> + v 2 . 018903 1 . 184975 - 0 . 076443 <nl> + v 2 . 152745 1 . 129537 - 0 . 076443 <nl> + v 1 . 885062 1 . 129535 - 2 . 654346 <nl> + v 1 . 885062 1 . 129537 - 0 . 076443 <nl> + v 1 . 829623 0 . 995695 - 2 . 654346 <nl> + v 1 . 829623 0 . 995695 - 0 . 076443 <nl> + v 1 . 885062 0 . 861856 - 2 . 654346 <nl> + v 1 . 885062 0 . 861855 - 0 . 076443 <nl> + v 2 . 018903 0 . 806415 - 2 . 654346 <nl> + v 2 . 018903 0 . 806415 - 0 . 076443 <nl> + v 2 . 152745 0 . 861856 - 2 . 654346 <nl> + v 2 . 152745 0 . 861855 - 0 . 076443 <nl> + v 2 . 208183 0 . 995695 - 2 . 654346 <nl> + v 2 . 208183 0 . 995695 - 0 . 076443 <nl> + v 2 . 018903 0 . 995695 0 . 076003 <nl> + v 2 . 018903 0 . 995931 - 2 . 778477 <nl> + v - 2 . 152745 1 . 129535 - 2 . 654346 <nl> + v - 2 . 018903 1 . 184975 - 2 . 654349 <nl> + v - 2 . 018903 1 . 184975 - 0 . 076443 <nl> + v - 2 . 152745 1 . 129537 - 0 . 076443 <nl> + v - 1 . 885062 1 . 129535 - 2 . 654346 <nl> + v - 1 . 885062 1 . 129537 - 0 . 076443 <nl> + v - 1 . 829623 0 . 995695 - 2 . 654346 <nl> + v - 1 . 829623 0 . 995695 - 0 . 076443 <nl> + v - 1 . 885062 0 . 861856 - 2 . 654346 <nl> + v - 1 . 885062 0 . 861855 - 0 . 076443 <nl> + v - 2 . 018903 0 . 806415 - 2 . 654346 <nl> + v - 2 . 018903 0 . 806415 - 0 . 076443 <nl> + v - 2 . 152745 0 . 861856 - 2 . 654346 <nl> + v - 2 . 152745 0 . 861855 - 0 . 076443 <nl> + v - 2 . 208183 0 . 995695 - 2 . 654346 <nl> + v - 2 . 208183 0 . 995695 - 0 . 076443 <nl> + v - 2 . 018903 0 . 995695 0 . 076003 <nl> + v - 2 . 018903 0 . 995931 - 2 . 778477 <nl> + v - 0 . 549117 - 0 . 880255 7 . 049499 <nl> + v - 0 . 549117 - 0 . 366897 7 . 049499 <nl> + v - 0 . 549117 - 0 . 231349 7 . 400979 <nl> + v - 0 . 549117 - 0 . 590024 7 . 42836 <nl> + v - 2 . 221097 - 0 . 740847 - 0 . 204388 <nl> + v - 4 . 208594 - 0 . 740847 - 0 . 896515 <nl> + v - 2 . 221097 0 . 158004 - 0 . 204388 <nl> + v - 4 . 208594 0 . 158004 - 0 . 896515 <nl> + v - 2 . 221097 0 . 158004 - 3 . 981237 <nl> + v - 4 . 208594 0 . 158004 - 3 . 516596 <nl> + v - 2 . 221097 - 0 . 740847 - 3 . 981237 <nl> + v - 4 . 208594 - 0 . 740847 - 3 . 516596 <nl> + v - 2 . 032921 0 . 247995 3 . 029242 <nl> + v - 1 . 460364 0 . 247995 2 . 792081 <nl> + v - 0 . 887809 0 . 247995 3 . 029242 <nl> + v - 0 . 650649 0 . 247995 3 . 601797 <nl> + v - 0 . 887809 0 . 247995 4 . 174353 <nl> + v - 1 . 460364 0 . 247995 4 . 411513 <nl> + v - 2 . 032921 0 . 247995 4 . 174353 <nl> + v - 2 . 270081 0 . 247995 3 . 601797 <nl> + v - 2 . 538304 0 . 759102 - 6 . 135367 <nl> + v - 1 . 965749 0 . 759102 - 6 . 372528 <nl> + v - 1 . 393193 0 . 759102 - 6 . 135367 <nl> + v - 1 . 156033 0 . 759102 - 5 . 562812 <nl> + v - 1 . 393193 0 . 759102 - 4 . 990256 <nl> + v - 1 . 965749 0 . 759102 - 4 . 753095 <nl> + v - 2 . 538304 0 . 759102 - 4 . 990255 <nl> + v - 2 . 775465 0 . 759102 - 5 . 562812 <nl> + v - 2 . 538304 1 . 408424 - 6 . 135367 <nl> + v - 1 . 965749 1 . 408424 - 6 . 372528 <nl> + v - 1 . 393193 1 . 408424 - 6 . 135367 <nl> + v - 1 . 156033 1 . 408424 - 5 . 562812 <nl> + v - 1 . 393193 1 . 408424 - 4 . 990256 <nl> + v - 1 . 965749 1 . 408424 - 4 . 753095 <nl> + v - 2 . 538304 1 . 408424 - 4 . 990255 <nl> + v - 2 . 775465 1 . 408424 - 5 . 562812 <nl> + v - 1 . 965749 1 . 408424 - 5 . 562812 <nl> + v - 1 . 666678 1 . 334443 - 5 . 145707 <nl> + v - 2 . 299088 1 . 334443 - 5 . 145707 <nl> + v - 1 . 666678 1 . 966853 - 5 . 145707 <nl> + v - 2 . 299088 1 . 966853 - 5 . 145707 <nl> + v - 1 . 666678 1 . 966853 - 5 . 778117 <nl> + v - 2 . 299088 1 . 966853 - 5 . 778117 <nl> + v - 1 . 666678 1 . 334443 - 5 . 778117 <nl> + v - 2 . 299088 1 . 334443 - 5 . 778117 <nl> + v - 2 . 036188 1 . 638001 - 5 . 21675 <nl> + v - 1 . 963871 1 . 667955 - 5 . 216752 <nl> + v - 1 . 891555 1 . 638001 - 5 . 21675 <nl> + v 1 . 735587 0 . 649931 2 . 372068 <nl> + v 2 . 276793 0 . 598225 2 . 359797 <nl> + v 0 - 0 . 880255 7 . 049499 <nl> + v 1 . 813632 0 . 760322 - 4 . 076154 <nl> + v 0 - 0 . 865952 7 . 228139 <nl> + v 0 . 525472 0 . 759814 - 4 . 076156 <nl> + v 0 . 52502 0 . 704589 1 . 837225 <nl> + v 1 . 043754 0 . 65004 2 . 37211 <nl> + v 1 . 735587 0 . 771575 2 . 372068 <nl> + v 1 . 813248 0 . 882105 0 . 751968 <nl> + v 2 . 276793 0 . 719869 2 . 359797 <nl> + v 3 . 007264 0 . 675615 0 . 751926 <nl> + v 1 . 813632 0 . 881966 - 4 . 076154 <nl> + v 3 . 008201 0 . 675603 - 4 . 076154 <nl> + v 0 . 525481 0 . 882195 0 . 75201 <nl> + v 0 . 525481 0 . 882292 - 4 . 076154 <nl> + v 0 . 525481 0 . 826994 1 . 840059 <nl> + v 1 . 043754 0 . 771684 2 . 37211 <nl> + v 0 . 525011 0 . 758956 0 . 749175 <nl> + v 3 . 007732 0 . 553965 - 0 . 738622 <nl> + v 3 . 007732 0 . 675609 - 0 . 738622 <nl> + v 1 . 81344 0 . 882035 - 0 . 738601 <nl> + v 0 . 525481 0 . 882244 - 0 . 73858 <nl> + v 0 . 525241 0 . 759385 - 0 . 739998 <nl> + v - 0 . 549117 - 0 . 399614 7 . 049499 <nl> + v 0 . 620102 1 . 844369 - 3 . 601022 <nl> + v 0 . 846037 1 . 755779 - 3 . 71401 <nl> + v 1 . 310041 0 . 672056 - 4 . 076154 <nl> + v 1 . 16988 2 . 894725 - 3 . 501955 <nl> + v 1 . 269897 2 . 855507 - 3 . 551973 <nl> + v 1 . 132038 2 . 932909 - 3 . 607564 <nl> + v 1 . 036546 0 . 428545 5 . 751309 <nl> + v 1 . 315024 0 . 760461 0 . 751968 <nl> + v 1 . 836507 0 . 376839 5 . 864282 <nl> + v 3 . 007264 0 . 553971 0 . 751926 <nl> + v 1 . 315409 0 . 760322 - 4 . 076154 <nl> + v 3 . 008201 0 . 553959 - 4 . 076154 <nl> + v 1 . 232055 2 . 893691 - 3 . 657582 <nl> + v 0 0 . 760648 - 4 . 076154 <nl> + v 0 0 . 428762 5 . 751394 <nl> + v 0 . 981744 - 0 . 879086 7 . 062063 <nl> + v 0 . 981744 0 . 008673 7 . 062063 <nl> + v 0 . 534619 1 . 930626 - 3 . 839588 <nl> + v 1 . 310041 - 1 . 310041 - 4 . 076154 <nl> + v 2 . 997463 - 0 . 990787 - 4 . 076154 <nl> + v 2 . 997463 0 . 46602 - 4 . 076154 <nl> + v 2 . 997463 0 . 46602 0 . 749076 <nl> + v 1 . 310041 - 1 . 310041 0 . 749076 <nl> + v 2 . 997463 - 0 . 990787 0 . 749076 <nl> + v 1 . 827392 - 0 . 716184 6 . 50097 <nl> + v 1 . 25879 - 0 . 770909 7 . 062063 <nl> + v 1 . 827643 0 . 288876 5 . 858582 <nl> + v 1 . 254241 - 0 . 019801 7 . 062063 <nl> + v 0 . 981744 - 0 . 879086 - 8 . 433464 <nl> + v 0 . 981744 0 . 879086 - 8 . 433464 <nl> + v 1 . 310041 1 . 310041 - 4 . 605186 <nl> + v 1 . 310041 - 1 . 310041 - 4 . 605186 <nl> + v 2 . 997463 - 0 . 990787 - 4 . 605186 <nl> + v 2 . 132894 - 0 . 664855 - 8 . 433464 <nl> + v 2 . 997463 0 . 990787 - 4 . 605186 <nl> + v 2 . 132894 0 . 664855 - 8 . 433464 <nl> + v 2 . 997463 0 . 990787 - 6 . 807402 <nl> + v 1 . 310041 1 . 310041 - 6 . 807402 <nl> + v 1 . 310041 - 1 . 310041 - 6 . 807402 <nl> + v 2 . 997463 - 0 . 990787 - 6 . 807402 <nl> + v 3 . 090473 - 0 . 421017 - 4 . 647384 <nl> + v 3 . 935092 - 0 . 421017 - 4 . 647384 <nl> + v 3 . 090473 0 . 421017 - 4 . 647384 <nl> + v 3 . 935092 0 . 421017 - 4 . 647384 <nl> + v 3 . 090473 0 . 421017 - 7 . 4454 <nl> + v 3 . 935092 0 . 421017 - 7 . 4454 <nl> + v 3 . 090473 - 0 . 421017 - 7 . 4454 <nl> + v 3 . 935092 - 0 . 421017 - 7 . 4454 <nl> + v 3 . 090473 0 . 421017 - 8 . 572815 <nl> + v 3 . 620514 0 . 421017 - 8 . 572815 <nl> + v 3 . 620514 - 0 . 421017 - 8 . 572815 <nl> + v 3 . 090473 - 0 . 421017 - 8 . 572815 <nl> + v 1 . 310041 0 . 670313 - 2 . 111028 <nl> + v 0 . 655086 0 . 670313 - 0 . 750658 <nl> + v 1 . 310041 1 . 517316 - 2 . 111028 <nl> + v 0 . 655086 1 . 106749 - 0 . 750658 <nl> + v 0 . 655086 1 . 517316 - 4 . 069324 <nl> + v 1 . 310041 1 . 517316 - 3 . 4212 <nl> + v 1 . 310041 0 . 670313 - 3 . 4212 <nl> + v 0 . 655086 0 . 670313 - 4 . 069324 <nl> + v - 1 . 861601 1 . 565685 - 5 . 216749 <nl> + v - 1 . 891555 1 . 493369 - 5 . 21675 <nl> + v - 1 . 963871 1 . 463414 - 5 . 21675 <nl> + v - 2 . 036188 1 . 493369 - 5 . 21675 <nl> + v - 2 . 066142 1 . 565685 - 5 . 216749 <nl> + v - 2 . 036188 1 . 638001 - 4 . 177855 <nl> + v - 1 . 963871 1 . 667955 - 4 . 177855 <nl> + v - 1 . 891555 1 . 638001 - 4 . 177855 <nl> + v - 1 . 861601 1 . 565685 - 4 . 177855 <nl> + v - 1 . 891555 1 . 493369 - 4 . 177855 <nl> + v - 1 . 963871 1 . 463414 - 4 . 177855 <nl> + v - 2 . 036188 1 . 493369 - 4 . 177855 <nl> + v - 2 . 066142 1 . 565685 - 4 . 177855 <nl> + v - 1 . 963871 1 . 565685 - 4 . 177855 <nl> + v - 2 . 036188 1 . 877795 - 5 . 21675 <nl> + v - 1 . 963871 1 . 907749 - 5 . 216752 <nl> + v - 1 . 891555 1 . 877795 - 5 . 21675 <nl> + v - 1 . 861601 1 . 805479 - 5 . 216749 <nl> + v - 1 . 891555 1 . 733163 - 5 . 21675 <nl> + v - 1 . 963871 1 . 703208 - 5 . 21675 <nl> + v - 2 . 036188 1 . 733163 - 5 . 21675 <nl> + v - 2 . 066142 1 . 805479 - 5 . 216749 <nl> + v - 2 . 036188 1 . 877795 - 4 . 177855 <nl> + v - 1 . 963871 1 . 907749 - 4 . 177855 <nl> + v - 1 . 891555 1 . 877795 - 4 . 177855 <nl> + v - 1 . 861601 1 . 805479 - 4 . 177855 <nl> + v - 1 . 891555 1 . 733163 - 4 . 177855 <nl> + v - 1 . 963871 1 . 703208 - 4 . 177855 <nl> + v - 2 . 036188 1 . 733163 - 4 . 177855 <nl> + v - 2 . 066142 1 . 805479 - 4 . 177855 <nl> + v - 1 . 963871 1 . 805479 - 4 . 177855 <nl> + v 0 - 1 . 459791 - 3 . 956097 <nl> + v - 7 . 609053 - 1 . 069013 0 . 551177 <nl> + v 1 . 209824 2 . 146268 - 4 . 643119 <nl> + v 0 . 549117 - 0 . 865952 7 . 228139 <nl> + v 0 . 549117 0 . 004196 7 . 228139 <nl> + v 0 . 549117 - 0 . 017407 7 . 0495 <nl> + v 0 . 549117 - 0 . 880255 7 . 049499 <nl> + v 0 . 549117 - 0 . 366897 7 . 049499 <nl> + v 0 . 549117 - 0 . 231349 7 . 400979 <nl> + v 0 . 549117 - 0 . 590024 7 . 42836 <nl> + v 2 . 221097 - 0 . 740847 - 0 . 204388 <nl> + v 4 . 208594 - 0 . 740847 - 0 . 896515 <nl> + v 2 . 221097 0 . 158004 - 0 . 204388 <nl> + v 4 . 208594 0 . 158004 - 0 . 896515 <nl> + v 2 . 221097 0 . 158004 - 3 . 981237 <nl> + v 4 . 208594 0 . 158004 - 3 . 516596 <nl> + v 2 . 221097 - 0 . 740847 - 3 . 981237 <nl> + v 4 . 208594 - 0 . 740847 - 3 . 516596 <nl> + v 2 . 032921 0 . 247995 3 . 029242 <nl> + v 1 . 460364 0 . 247995 2 . 792081 <nl> + v 0 . 887809 0 . 247995 3 . 029242 <nl> + v 0 . 650649 0 . 247995 3 . 601797 <nl> + v 0 . 887809 0 . 247995 4 . 174353 <nl> + v 1 . 460364 0 . 247995 4 . 411513 <nl> + v 2 . 032921 0 . 247995 4 . 174353 <nl> + v 2 . 270081 0 . 247995 3 . 601797 <nl> + v - 7 . 609053 - 0 . 765268 0 . 551177 <nl> + v 0 . 522715 2 . 473121 - 4 . 605861 <nl> + v - 7 . 609053 - 0 . 765268 - 0 . 649518 <nl> + v 0 . 021794 2 . 612102 - 4 . 048994 <nl> + v - 7 . 609053 - 1 . 069013 - 0 . 649518 <nl> + v 0 - 1 . 459791 6 . 071965 <nl> + v - 5 . 143484 - 1 . 069013 0 . 812165 <nl> + v 0 - 0 . 765268 6 . 071965 <nl> + v - 5 . 143484 - 0 . 765268 0 . 812165 <nl> + v 2 . 538304 0 . 759102 - 6 . 135367 <nl> + v 1 . 965749 0 . 759102 - 6 . 372528 <nl> + v 1 . 393193 0 . 759102 - 6 . 135367 <nl> + v 1 . 156033 0 . 759102 - 5 . 562812 <nl> + v 1 . 393193 0 . 759102 - 4 . 990256 <nl> + v 1 . 965749 0 . 759102 - 4 . 753095 <nl> + v 2 . 538304 0 . 759102 - 4 . 990255 <nl> + v 2 . 775465 0 . 759102 - 5 . 562812 <nl> + v 2 . 538304 1 . 408424 - 6 . 135367 <nl> + v 1 . 965749 1 . 408424 - 6 . 372528 <nl> + v 1 . 393193 1 . 408424 - 6 . 135367 <nl> + v 1 . 156033 1 . 408424 - 5 . 562812 <nl> + v 1 . 393193 1 . 408424 - 4 . 990256 <nl> + v 1 . 965749 1 . 408424 - 4 . 753095 <nl> + v 2 . 538304 1 . 408424 - 4 . 990255 <nl> + v 2 . 775465 1 . 408424 - 5 . 562812 <nl> + v 1 . 965749 1 . 408424 - 5 . 562812 <nl> + v 1 . 666678 1 . 334443 - 5 . 145707 <nl> + v 2 . 299088 1 . 334443 - 5 . 145707 <nl> + v 1 . 666678 1 . 966853 - 5 . 145707 <nl> + v 2 . 299088 1 . 966853 - 5 . 145707 <nl> + v 1 . 666678 1 . 966853 - 5 . 778117 <nl> + v 2 . 299088 1 . 966853 - 5 . 778117 <nl> + v 1 . 666678 1 . 334443 - 5 . 778117 <nl> + v 2 . 299088 1 . 334443 - 5 . 778117 <nl> + v 2 . 036188 1 . 638001 - 5 . 21675 <nl> + v 1 . 963871 1 . 667955 - 5 . 216752 <nl> + v 1 . 891555 1 . 638001 - 5 . 21675 <nl> + v 1 . 861601 1 . 565685 - 5 . 216749 <nl> + v 1 . 891555 1 . 493369 - 5 . 21675 <nl> + v 1 . 963871 1 . 463414 - 5 . 21675 <nl> + v 2 . 036188 1 . 493369 - 5 . 21675 <nl> + v 2 . 066142 1 . 565685 - 5 . 216749 <nl> + v 2 . 036188 1 . 638001 - 4 . 177855 <nl> + v 1 . 963871 1 . 667955 - 4 . 177855 <nl> + v 1 . 891555 1 . 638001 - 4 . 177855 <nl> + v 1 . 861601 1 . 565685 - 4 . 177855 <nl> + v 1 . 891555 1 . 493369 - 4 . 177855 <nl> + v 1 . 963871 1 . 463414 - 4 . 177855 <nl> + v 2 . 036188 1 . 493369 - 4 . 177855 <nl> + v 2 . 066142 1 . 565685 - 4 . 177855 <nl> + v 1 . 963871 1 . 565685 - 4 . 177855 <nl> + v 2 . 036188 1 . 877795 - 5 . 21675 <nl> + v 1 . 963871 1 . 907749 - 5 . 216752 <nl> + v 1 . 891555 1 . 877795 - 5 . 21675 <nl> + v 1 . 861601 1 . 805479 - 5 . 216749 <nl> + v 1 . 891555 1 . 733163 - 5 . 21675 <nl> + v 1 . 963871 1 . 703208 - 5 . 21675 <nl> + v 2 . 036188 1 . 733163 - 5 . 21675 <nl> + v 2 . 066142 1 . 805479 - 5 . 216749 <nl> + v 2 . 036188 1 . 877795 - 4 . 177855 <nl> + v 1 . 963871 1 . 907749 - 4 . 177855 <nl> + v 1 . 891555 1 . 877795 - 4 . 177855 <nl> + v 1 . 861601 1 . 805479 - 4 . 177855 <nl> + v 1 . 891555 1 . 733163 - 4 . 177855 <nl> + v 1 . 963871 1 . 703208 - 4 . 177855 <nl> + v 2 . 036188 1 . 733163 - 4 . 177855 <nl> + v 2 . 066142 1 . 805479 - 4 . 177855 <nl> + v 1 . 963871 1 . 805479 - 4 . 177855 <nl> + v 0 . 760554 1 . 842035 - 3 . 952577 <nl> + v 7 . 609053 - 1 . 069013 0 . 551177 <nl> + v 0 - 0 . 765268 - 3 . 956097 <nl> + v 7 . 609053 - 0 . 765268 0 . 551177 <nl> + v 0 - 0 . 765268 - 7 . 732946 <nl> + v 7 . 609053 - 0 . 765268 - 0 . 649518 <nl> + v 0 - 1 . 459791 - 7 . 732946 <nl> + v 7 . 609053 - 1 . 069013 - 0 . 649518 <nl> + v 1 . 214601 2 . 038227 - 4 . 805394 <nl> + v 5 . 143484 - 1 . 069013 0 . 812165 <nl> + v 0 . 421783 2 . 415365 - 4 . 762404 <nl> + v 5 . 143484 - 0 . 765268 0 . 812165 <nl> + v 0 - 0 . 765268 0 . 439388 <nl> + v 5 . 143484 - 0 . 765268 - 0 . 38853 <nl> + v - 0 . 156203 2 . 575728 - 4 . 119865 <nl> + v 5 . 143484 - 1 . 069013 - 0 . 38853 <nl> + v 1 . 032114 0 . 340364 5 . 745526 <nl> + v 0 . 964145 - 1 . 094563 6 . 551094 <nl> + v 0 0 . 340364 5 . 745526 <nl> + v 0 0 . 008673 7 . 062063 <nl> + v - 0 . 180782 2 . 425379 - 3 . 254169 <nl> + v 0 . 362446 2 . 052389 - 2 . 672427 <nl> + v 1 . 155263 1 . 675251 - 2 . 715417 <nl> + v 0 - 1 . 310041 - 4 . 076154 <nl> + v 0 0 . 672056 - 4 . 076154 <nl> + v 0 0 . 670313 - 0 . 750658 <nl> + v 0 1 . 106749 - 0 . 750658 <nl> + v 0 1 . 517316 - 2 . 111028 <nl> + v 0 1 . 517316 - 3 . 4212 <nl> + v 0 1 . 517316 - 4 . 069324 <nl> + v 1 . 733249 1 . 514889 - 3 . 357956 <nl> + v 1 . 757828 1 . 665238 - 4 . 223653 <nl> + v 1 . 266634 2 . 145324 - 4 . 785317 <nl> + v 0 . 473817 2 . 522462 - 4 . 742327 <nl> + v - 0 . 10417 2 . 682825 - 4 . 099788 <nl> + v 0 - 1 . 310041 - 6 . 807402 <nl> + v 0 - 1 . 310041 - 4 . 605186 <nl> + v 1 . 543045 - 1 . 342558 4 . 494025 <nl> + v 1 . 543045 - 0 . 765268 4 . 494025 <nl> + v 1 . 543045 - 0 . 765268 0 . 191013 <nl> + v 1 . 543045 - 1 . 342558 0 . 191013 <nl> + v - 0 . 128748 2 . 532475 - 3 . 234091 <nl> + v 0 . 414479 2 . 159486 - 2 . 652349 <nl> + v 0 - 0 . 017407 7 . 0495 <nl> + v 0 0 . 004196 7 . 228139 <nl> + v 1 . 207297 1 . 782348 - 2 . 69534 <nl> + v 1 . 785283 1 . 621985 - 3 . 337879 <nl> + v 0 . 549117 - 0 . 399614 7 . 049499 <nl> + v - 1 . 735587 0 . 649931 2 . 372068 <nl> + v - 2 . 276793 0 . 598225 2 . 359797 <nl> + v 1 . 809861 1 . 772335 - 4 . 203576 <nl> + v - 1 . 813632 0 . 760322 - 4 . 076154 <nl> + v 0 . 937994 1 . 747884 - 4 . 5237 <nl> + v - 0 . 525472 0 . 759814 - 4 . 076156 <nl> + v - 0 . 52502 0 . 704589 1 . 837225 <nl> + v - 1 . 043754 0 . 65004 2 . 37211 <nl> + v - 1 . 735587 0 . 771575 2 . 372068 <nl> + v - 1 . 813248 0 . 882105 0 . 751968 <nl> + v - 2 . 276793 0 . 719869 2 . 359797 <nl> + v - 3 . 007264 0 . 675615 0 . 751926 <nl> + v - 1 . 813632 0 . 881966 - 4 . 076154 <nl> + v - 3 . 008201 0 . 675603 - 4 . 076154 <nl> + v - 0 . 525481 0 . 882195 0 . 75201 <nl> + v - 0 . 525481 0 . 882292 - 4 . 076154 <nl> + v - 0 . 525481 0 . 826994 1 . 840059 <nl> + v - 1 . 043754 0 . 771684 2 . 37211 <nl> + v - 0 . 525011 0 . 758956 0 . 749175 <nl> + v - 3 . 007732 0 . 553965 - 0 . 738622 <nl> + v - 3 . 007732 0 . 675609 - 0 . 738622 <nl> + v - 1 . 81344 0 . 882035 - 0 . 738601 <nl> + v - 0 . 525481 0 . 882244 - 0 . 73858 <nl> + v - 0 . 525241 0 . 759385 - 0 . 739998 <nl> + v - 1 . 032114 0 . 340364 5 . 745526 <nl> + v 0 . 583818 1 . 623981 - 3 . 817896 <nl> + v 0 . 395361 2 . 00601 - 4 . 494276 <nl> + v - 1 . 310041 0 . 672056 - 4 . 076154 <nl> + v - 2 . 997463 0 . 46602 - 4 . 076154 <nl> + v - 0 . 000234 2 . 115768 - 4 . 054499 <nl> + v - 0 . 017056 2 . 012864 - 3 . 461985 <nl> + v - 1 . 036546 0 . 428545 5 . 751309 <nl> + v - 1 . 315024 0 . 760461 0 . 751968 <nl> + v - 1 . 836507 0 . 376839 5 . 864282 <nl> + v - 3 . 007264 0 . 553971 0 . 751926 <nl> + v - 1 . 315409 0 . 760322 - 4 . 076154 <nl> + v - 3 . 008201 0 . 553959 - 4 . 076154 <nl> + v 0 0 . 760551 0 . 75201 <nl> + v 0 . 354749 1 . 757576 - 3 . 06382 <nl> + v 0 . 897382 1 . 49945 - 3 . 093244 <nl> + v - 0 . 981744 - 0 . 879086 7 . 062063 <nl> + v - 0 . 981744 0 . 008673 7 . 062063 <nl> + v 1 . 292976 1 . 389691 - 3 . 533021 <nl> + v - 1 . 310041 - 1 . 310041 - 4 . 076154 <nl> + v - 2 . 997463 - 0 . 990787 - 4 . 076154 <nl> + v 1 . 309798 1 . 492596 - 4 . 125535 <nl> + v - 2 . 997463 0 . 46602 0 . 749076 <nl> + v - 1 . 310041 - 1 . 310041 0 . 749076 <nl> + v - 2 . 997463 - 0 . 990787 0 . 749076 <nl> + v - 1 . 827392 - 0 . 716184 6 . 50097 <nl> + v - 1 . 25879 - 0 . 770909 7 . 062063 <nl> + v - 1 . 827643 0 . 288876 5 . 858582 <nl> + v - 1 . 254241 - 0 . 019801 7 . 062063 <nl> + v - 0 . 981744 - 0 . 879086 - 8 . 433464 <nl> + v - 0 . 981744 0 . 879086 - 8 . 433464 <nl> + v - 1 . 310041 1 . 310041 - 4 . 605186 <nl> + v - 1 . 310041 - 1 . 310041 - 4 . 605186 <nl> + v - 2 . 997463 - 0 . 990787 - 4 . 605186 <nl> + v - 2 . 132894 - 0 . 664855 - 8 . 433464 <nl> + v - 2 . 997463 0 . 990787 - 4 . 605186 <nl> + v - 2 . 132894 0 . 664855 - 8 . 433464 <nl> + v - 2 . 997463 0 . 990787 - 6 . 807402 <nl> + v - 1 . 310041 1 . 310041 - 6 . 807402 <nl> + v - 1 . 310041 - 1 . 310041 - 6 . 807402 <nl> + v - 2 . 997463 - 0 . 990787 - 6 . 807402 <nl> + v - 3 . 090473 - 0 . 421017 - 4 . 647384 <nl> + v - 3 . 935092 - 0 . 421017 - 4 . 647384 <nl> + v - 3 . 090473 0 . 421017 - 4 . 647384 <nl> + v - 3 . 935092 0 . 421017 - 4 . 647384 <nl> + v - 3 . 090473 0 . 421017 - 7 . 4454 <nl> + v - 3 . 935092 0 . 421017 - 7 . 4454 <nl> + v - 3 . 090473 - 0 . 421017 - 7 . 4454 <nl> + v - 3 . 935092 - 0 . 421017 - 7 . 4454 <nl> + v - 3 . 090473 0 . 421017 - 8 . 572815 <nl> + v - 3 . 620514 0 . 421017 - 8 . 572815 <nl> + v - 3 . 620514 - 0 . 421017 - 8 . 572815 <nl> + v - 3 . 090473 - 0 . 421017 - 8 . 572815 <nl> + v - 1 . 310041 0 . 670313 - 2 . 111028 <nl> + v - 0 . 655086 0 . 670313 - 0 . 750658 <nl> + v - 1 . 310041 1 . 517316 - 2 . 111028 <nl> + v - 0 . 655086 1 . 106749 - 0 . 750658 <nl> + v - 0 . 655086 1 . 517316 - 4 . 069324 <nl> + v - 1 . 310041 1 . 517316 - 3 . 4212 <nl> + v - 1 . 310041 0 . 670313 - 3 . 4212 <nl> + v - 0 . 655086 0 . 670313 - 4 . 069324 <nl> + v 0 . 000493 2 . 481799 - 3 . 298723 <nl> + v - 5 . 143484 - 0 . 765268 - 0 . 38853 <nl> + v 0 - 1 . 459791 0 . 439388 <nl> + v - 5 . 143484 - 1 . 069013 - 0 . 38853 <nl> + v 0 . 47129 2 . 158541 - 2 . 794548 <nl> + v - 0 . 964145 - 1 . 094563 6 . 551094 <nl> + v 1 . 158398 1 . 831689 - 2 . 831806 <nl> + v 1 . 65932 1 . 692708 - 3 . 388673 <nl> + v 0 - 0 . 879086 7 . 062063 <nl> + v 0 - 1 . 094563 6 . 551094 <nl> + v 0 - 1 . 310041 0 . 749076 <nl> + v 1 . 680621 1 . 823011 - 4 . 138944 <nl> + v 0 . 980091 1 . 966239 - 4 . 324068 <nl> + v 0 . 702984 1 . 869251 - 3 . 771916 <nl> + v 0 . 555579 2 . 168176 - 4 . 301049 <nl> + v 0 . 246098 2 . 254042 - 3 . 957004 <nl> + v 0 . 232938 2 . 173538 - 3 . 493469 <nl> + v - 0 . 549117 - 0 . 865952 7 . 228139 <nl> + v 0 . 523807 1 . 973822 - 3 . 181978 <nl> + v 0 . 948319 1 . 771885 - 3 . 204996 <nl> + v 0 1 . 310041 - 4 . 605186 <nl> + v 0 1 . 310041 - 6 . 807402 <nl> + v 0 0 . 879086 - 8 . 433464 <nl> + v - 0 . 549117 0 . 004196 7 . 228139 <nl> + v - 0 . 549117 - 0 . 017407 7 . 0495 <nl> + v 0 - 0 . 879086 - 8 . 433464 <nl> + v 1 . 257799 1 . 686019 - 3 . 549042 <nl> + v 1 . 27096 1 . 766523 - 4 . 012577 <nl> + v - 1 . 543045 - 1 . 342558 4 . 494025 <nl> + v - 1 . 543045 - 0 . 765268 4 . 494025 <nl> + v - 1 . 543045 - 0 . 765268 0 . 191013 <nl> + v - 1 . 543045 - 1 . 342558 0 . 191013 <nl> + v 0 - 0 . 590024 7 . 42836 <nl> + v 0 - 0 . 231349 7 . 400979 <nl> + <nl> + vt 0 . 401122 0 . 24589 0 <nl> + vt 0 . 422237 0 . 155289 0 <nl> + vt 0 . 408574 0 . 264883 0 <nl> + vt 0 . 426978 0 . 155184 0 <nl> + vt 0 . 427029 0 . 272985 0 <nl> + vt 0 . 428212 0 . 21811 0 <nl> + vt 0 . 445931 0 . 265758 0 <nl> + vt 0 . 42348 0 . 218206 0 <nl> + vt 0 . 4272 0 . 27239 0 <nl> + vt 0 . 431721 0 . 155075 0 <nl> + vt 0 . 408554 0 . 26473 0 <nl> + vt 0 . 432943 0 . 218016 0 <nl> + vt 0 . 445663 0 . 265617 0 <nl> + vt 0 . 436468 0 . 154961 0 <nl> + vt 0 . 401327 0 . 245829 0 <nl> + vt 0 . 437675 0 . 217926 0 <nl> + vt 0 . 453094 0 . 247489 0 <nl> + vt 0 . 441219 0 . 154844 0 <nl> + vt 0 . 409582 0 . 227353 0 <nl> + vt 0 . 442407 0 . 217839 0 <nl> + vt 0 . 446378 0 . 229457 0 <nl> + vt 0 . 40802 0 . 155591 0 <nl> + vt 0 . 445975 0 . 154726 0 <nl> + vt 0 . 428835 0 . 22083 0 <nl> + vt 0 . 409279 0 . 218484 0 <nl> + vt 0 . 447548 0 . 217839 0 <nl> + vt 0 . 42874 0 . 221085 0 <nl> + vt 0 . 412758 0 . 155492 0 <nl> + vt 0 . 446431 0 . 229436 0 <nl> + vt 0 . 414015 0 . 218391 0 <nl> + vt 0 . 409701 0 . 227457 0 <nl> + vt 0 . 417497 0 . 155392 0 <nl> + vt 0 . 453306 0 . 247283 0 <nl> + vt 0 . 418748 0 . 218299 0 <nl> + vt 0 . 428284 0 . 246556 0 <nl> + vt 0 . 428479 0 . 246771 0 <nl> + vt 0 . 401122 0 . 24589 0 <nl> + vt 0 . 422237 0 . 155289 0 <nl> + vt 0 . 408574 0 . 264883 0 <nl> + vt 0 . 426978 0 . 155184 0 <nl> + vt 0 . 427029 0 . 272985 0 <nl> + vt 0 . 428212 0 . 21811 0 <nl> + vt 0 . 445931 0 . 265758 0 <nl> + vt 0 . 42348 0 . 218206 0 <nl> + vt 0 . 4272 0 . 27239 0 <nl> + vt 0 . 431721 0 . 155075 0 <nl> + vt 0 . 408554 0 . 26473 0 <nl> + vt 0 . 432943 0 . 218016 0 <nl> + vt 0 . 445663 0 . 265617 0 <nl> + vt 0 . 436468 0 . 154961 0 <nl> + vt 0 . 401327 0 . 245829 0 <nl> + vt 0 . 437675 0 . 217926 0 <nl> + vt 0 . 453094 0 . 247489 0 <nl> + vt 0 . 441219 0 . 154844 0 <nl> + vt 0 . 409582 0 . 227353 0 <nl> + vt 0 . 442407 0 . 217839 0 <nl> + vt 0 . 446378 0 . 229457 0 <nl> + vt 0 . 40802 0 . 155591 0 <nl> + vt 0 . 445975 0 . 154726 0 <nl> + vt 0 . 428835 0 . 22083 0 <nl> + vt 0 . 409279 0 . 218484 0 <nl> + vt 0 . 447548 0 . 217839 0 <nl> + vt 0 . 42874 0 . 221085 0 <nl> + vt 0 . 412758 0 . 155492 0 <nl> + vt 0 . 446431 0 . 229436 0 <nl> + vt 0 . 414015 0 . 218391 0 <nl> + vt 0 . 409701 0 . 227457 0 <nl> + vt 0 . 417497 0 . 155392 0 <nl> + vt 0 . 453306 0 . 247283 0 <nl> + vt 0 . 418748 0 . 218299 0 <nl> + vt 0 . 428284 0 . 246556 0 <nl> + vt 0 . 428479 0 . 246771 0 <nl> + vt 0 . 406674 0 . 167689 0 <nl> + vt 0 . 34778 0 . 206333 0 <nl> + vt 0 . 400506 0 . 092061 0 <nl> + vt 0 . 34714 0 . 076348 0 <nl> + vt 0 . 347422 0 . 129521 0 <nl> + vt 0 . 25309 0 . 155811 0 <nl> + vt 0 . 986632 0 . 334252 0 <nl> + vt 0 . 900869 0 . 480587 0 <nl> + vt 0 . 178263 0 . 12975 0 <nl> + vt 0 . 948411 0 . 446335 0 <nl> + vt 0 . 938762 0 . 317929 0 <nl> + vt 0 . 90054 0 . 43001 0 <nl> + vt 0 . 726249 0 . 319303 0 <nl> + vt 0 . 753116 0 . 430966 0 <nl> + vt 0 . 253094 0 . 013616 0 <nl> + vt 0 . 677076 0 . 331135 0 <nl> + vt 0 . 753444 0 . 48154 0 <nl> + vt 0 . 178266 0 . 031107 0 <nl> + vt 0 . 703943 0 . 442796 0 <nl> + vt 0 . 946295 0 . 240423 0 <nl> + vt 0 . 661994 0 . 243219 0 <nl> + vt 0 . 991137 0 . 240398 0 <nl> + vt 0 . 701254 0 . 243258 0 <nl> + vt 0 . 739885 0 . 243356 0 <nl> + vt 0 . 778704 0 . 243132 0 <nl> + vt 0 . 818178 0 . 242671 0 <nl> + vt 0 . 858856 0 . 241693 0 <nl> + vt 0 . 90173 0 . 240871 0 <nl> + vt 0 . 973266 0 . 207191 0 <nl> + vt 0 . 94624 0 . 287074 0 <nl> + vt 0 . 911901 0 . 23261 0 <nl> + vt 0 . 662047 0 . 284293 0 <nl> + vt 0 . 991082 0 . 287208 0 <nl> + vt 0 . 850535 0 . 207191 0 <nl> + vt 0 . 701289 0 . 284167 0 <nl> + vt 0 . 825117 0 . 145826 0 <nl> + vt 0 . 739912 0 . 284018 0 <nl> + vt 0 . 850535 0 . 084461 0 <nl> + vt 0 . 778729 0 . 284198 0 <nl> + vt 0 . 911901 0 . 059042 0 <nl> + vt 0 . 818183 0 . 284624 0 <nl> + vt 0 . 973266 0 . 084461 0 <nl> + vt 0 . 858836 0 . 28562 0 <nl> + vt 0 . 998684 0 . 145826 0 <nl> + vt 0 . 901683 0 . 286519 0 <nl> + vt 0 . 911901 0 . 142355 0 <nl> + vt 0 . 565962 0 . 396112 0 <nl> + vt 0 . 520712 0 . 441362 0 <nl> + vt 0 . 611211 0 . 396112 0 <nl> + vt 0 . 656461 0 . 441362 0 <nl> + vt 0 . 565962 0 . 441362 0 <nl> + vt 0 . 611211 0 . 441362 0 <nl> + vt 0 . 565962 0 . 486611 0 <nl> + vt 0 . 611211 0 . 486611 0 <nl> + vt 0 . 565962 0 . 531861 0 <nl> + vt 0 . 520712 0 . 486611 0 <nl> + vt 0 . 611211 0 . 531861 0 <nl> + vt 0 . 656461 0 . 486611 0 <nl> + vt 0 . 352159 0 . 224968 0 <nl> + vt 0 . 355175 0 . 224967 0 <nl> + vt 0 . 35819 0 . 224967 0 <nl> + vt 0 . 901262 0 . 530297 0 <nl> + vt 0 . 945558 0 . 536298 0 <nl> + vt 0 . 938872 0 . 531149 0 <nl> + vt 0 . 266663 0 . 206735 0 <nl> + vt 0 . 902345 0 . 986421 0 <nl> + vt 0 . 266539 0 . 18027 0 <nl> + vt 0 . 813927 0 . 986075 0 <nl> + vt 0 . 809312 0 . 573689 0 <nl> + vt 0 . 812099 0 . 56775 0 <nl> + vt 0 . 853688 0 . 529528 0 <nl> + vt 0 . 848087 0 . 53162 0 <nl> + vt 0 . 900755 0 . 538571 0 <nl> + vt 0 . 904638 0 . 649276 0 <nl> + vt 0 . 937884 0 . 539507 0 <nl> + vt 0 . 987257 0 . 649743 0 <nl> + vt 0 . 90173 0 . 978186 0 <nl> + vt 0 . 984307 0 . 979178 0 <nl> + vt 0 . 816956 0 . 648322 0 <nl> + vt 0 . 813964 0 . 977666 0 <nl> + vt 0 . 81769 0 . 573982 0 <nl> + vt 0 . 853542 0 . 537896 0 <nl> + vt 0 . 808549 0 . 64825 0 <nl> + vt 0 . 994729 0 . 751596 0 <nl> + vt 0 . 986429 0 . 751521 0 <nl> + vt 0 . 903756 0 . 750787 0 <nl> + vt 0 . 815903 0 . 749985 0 <nl> + vt 0 . 807509 0 . 749992 0 <nl> + vt 0 . 400909 0 . 096914 0 <nl> + vt 0 . 453481 0 . 393554 0 <nl> + vt 0 . 481795 0 . 340046 0 <nl> + vt 0 . 538348 0 . 389938 0 <nl> + vt 0 . 493884 0 . 33955 0 <nl> + vt 0 . 062187 0 . 98965 0 <nl> + vt 0 . 69945 0 . 98606 0 <nl> + vt 0 . 48742 0 . 393554 0 <nl> + vt 0 . 49267 0 . 393289 0 <nl> + vt 0 . 487583 0 . 397153 0 <nl> + vt 0 . 687993 0 . 503583 0 <nl> + vt 0 . 69842 0 . 750594 0 <nl> + vt 0 . 727594 0 . 498641 0 <nl> + vt 0 . 780939 0 . 750999 0 <nl> + vt 0 . 995564 0 . 649813 0 <nl> + vt 0 . 994931 0 . 646535 0 <nl> + vt 0 . 699276 0 . 981779 0 <nl> + vt 0 . 779679 0 . 980604 0 <nl> + vt 0 . 992605 0 . 979257 0 <nl> + vt 0 . 985632 0 . 987425 0 <nl> + vt 0 . 492708 0 . 397856 0 <nl> + vt 0 . 636086 0 . 982285 0 <nl> + vt 0 . 636859 0 . 503126 0 <nl> + vt 0 . 047272 0 . 488901 0 <nl> + vt 0 . 05879 0 . 007778 0 <nl> + vt 0 . 058235 0 . 053941 0 <nl> + vt 0 . 453908 0 . 401172 0 <nl> + vt 0 . 477006 0 . 449213 0 <nl> + vt 0 . 057779 0 . 913566 0 <nl> + vt 0 . 407615 0 . 505451 0 <nl> + vt 0 . 123087 0 . 916212 0 <nl> + vt 0 . 346673 0 . 542322 0 <nl> + vt 0 . 128965 0 . 974582 0 <nl> + vt 0 . 782818 0 . 981712 0 <nl> + vt 0 . 224808 0 . 340362 0 <nl> + vt 0 . 785169 0 . 750557 0 <nl> + vt 0 . 058749 0 . 73063 0 <nl> + vt 0 . 124342 0 . 730754 0 <nl> + vt 0 . 28587 0 . 303495 0 <nl> + vt 0 . 0814 0 . 510898 0 <nl> + vt 0 . 125459 0 . 063828 0 <nl> + vt 0 . 102683 0 . 029981 0 <nl> + vt 0 . 073324 0 . 01374 0 <nl> + vt 0 . 05933 0 . 488428 0 <nl> + vt 0 . 099108 0 . 116354 0 <nl> + vt 0 . 731869 0 . 49777 0 <nl> + vt 0 . 726871 0 . 494355 0 <nl> + vt 0 . 072323 0 . 053475 0 <nl> + vt 0 . 424823 0 . 351441 0 <nl> + vt 0 . 193953 0 . 981583 0 <nl> + vt 0 . 188639 0 . 887683 0 <nl> + vt 0 . 199784 0 . 698522 0 <nl> + vt 0 . 20532 0 . 571215 0 <nl> + vt 0 . 438044 0 . 211097 0 <nl> + vt 0 . 384199 0 . 711565 0 <nl> + vt 0 . 500316 0 . 212631 0 <nl> + vt 0 . 290876 0 . 593575 0 <nl> + vt 0 . 258604 0 . 963636 0 <nl> + vt 0 . 467461 0 . 353125 0 <nl> + vt 0 . 318819 0 . 910112 0 <nl> + vt 0 . 283877 0 . 695369 0 <nl> + vt 0 . 252001 0 . 887726 0 <nl> + vt 0 . 275255 0 . 80017 0 <nl> + vt 0 . 19945 0 . 803168 0 <nl> + vt 0 . 436354 0 . 290608 0 <nl> + vt 0 . 3662 0 . 823057 0 <nl> + vt 0 . 498348 0 . 292484 0 <nl> + vt 0 . 495948 0 . 957021 0 <nl> + vt 0 . 10292 0 . 392065 0 <nl> + vt 0 . 45675 0 . 997198 0 <nl> + vt 0 . 375916 0 . 956447 0 <nl> + vt 0 . 075154 0 . 42042 0 <nl> + vt 0 . 416227 0 . 997221 0 <nl> + vt 0 . 456712 0 . 956816 0 <nl> + vt 0 . 416225 0 . 956806 0 <nl> + vt 0 . 456172 0 . 82355 0 <nl> + vt 0 . 416731 0 . 824647 0 <nl> + vt 0 . 496678 0 . 822937 0 <nl> + vt 0 . 196696 0 . 483704 0 <nl> + vt 0 . 169196 0 . 512305 0 <nl> + vt 0 . 377041 0 . 822595 0 <nl> + vt 0 . 452832 0 . 768161 0 <nl> + vt 0 . 425823 0 . 769999 0 <nl> + vt 0 . 218443 0 . 537816 0 <nl> + vt 0 . 384197 0 . 764756 0 <nl> + vt 0 . 422662 0 . 726694 0 <nl> + vt 0 . 49481 0 . 766707 0 <nl> + vt 0 . 23535 0 . 519557 0 <nl> + vt 0 . 449921 0 . 724799 0 <nl> + vt 0 . 095834 0 . 208772 0 <nl> + vt 0 . 039343 0 . 137854 0 <nl> + vt 0 . 057027 0 . 147654 0 <nl> + vt 0 . 062632 0 . 222927 0 <nl> + vt 0 . 039308 0 . 158849 0 <nl> + vt 0 . 04078 0 . 315102 0 <nl> + vt 0 . 070835 0 . 280228 0 <nl> + vt 0 . 102932 0 . 307938 0 <nl> + vt 0 . 110762 0 . 270579 0 <nl> + vt 0 . 041282 0 . 358462 0 <nl> + vt 0 . 072792 0 . 342824 0 <nl> + vt 0 . 361206 0 . 224968 0 <nl> + vt 0 . 364222 0 . 224968 0 <nl> + vt 0 . 343112 0 . 224967 0 <nl> + vt 0 . 367238 0 . 224968 0 <nl> + vt 0 . 346128 0 . 224967 0 <nl> + vt 0 . 349143 0 . 224968 0 <nl> + vt 0 . 328345 0 . 296397 0 <nl> + vt 0 . 352159 0 . 264994 0 <nl> + vt 0 . 316111 0 . 301074 0 <nl> + vt 0 . 355175 0 . 264994 0 <nl> + vt 0 . 304153 0 . 295731 0 <nl> + vt 0 . 35819 0 . 264994 0 <nl> + vt 0 . 299475 0 . 283498 0 <nl> + vt 0 . 361206 0 . 264994 0 <nl> + vt 0 . 304818 0 . 271539 0 <nl> + vt 0 . 364222 0 . 264994 0 <nl> + vt 0 . 317052 0 . 266862 0 <nl> + vt 0 . 343112 0 . 264994 0 <nl> + vt 0 . 367238 0 . 264994 0 <nl> + vt 0 . 32901 0 . 272205 0 <nl> + vt 0 . 346128 0 . 264994 0 <nl> + vt 0 . 333688 0 . 284439 0 <nl> + vt 0 . 349143 0 . 264994 0 <nl> + vt 0 . 316582 0 . 283968 0 <nl> + vt 0 . 312838 0 . 224509 0 <nl> + vt 0 . 315906 0 . 22444 0 <nl> + vt 0 . 318977 0 . 22437 0 <nl> + vt 0 . 322049 0 . 224296 0 <nl> + vt 0 . 325124 0 . 22422 0 <nl> + vt 0 . 303636 0 . 224704 0 <nl> + vt 0 . 328202 0 . 224144 0 <nl> + vt 0 . 306703 0 . 22464 0 <nl> + vt 0 . 30977 0 . 224575 0 <nl> + vt 0 . 368307 0 . 296009 0 <nl> + vt 0 . 313643 0 . 265231 0 <nl> + vt 0 . 356074 0 . 300686 0 <nl> + vt 0 . 316705 0 . 265169 0 <nl> + vt 0 . 344115 0 . 295343 0 <nl> + vt 0 . 319768 0 . 265108 0 <nl> + vt 0 . 339438 0 . 28311 0 <nl> + vt 0 . 32283 0 . 26505 0 <nl> + vt 0 . 344781 0 . 271151 0 <nl> + vt 0 . 325893 0 . 264994 0 <nl> + vt 0 . 357015 0 . 266474 0 <nl> + vt 0 . 304451 0 . 265411 0 <nl> + vt 0 . 32922 0 . 264994 0 <nl> + vt 0 . 368973 0 . 271817 0 <nl> + vt 0 . 307516 0 . 265351 0 <nl> + vt 0 . 37365 0 . 284051 0 <nl> + vt 0 . 31058 0 . 265291 0 <nl> + vt 0 . 356544 0 . 28358 0 <nl> + vt 0 . 11116 0 . 337 0 <nl> + vt 0 . 614968 0 . 723363 0 <nl> + vt 0 . 608538 0 . 990523 0 <nl> + vt 0 . 29194 0 . 529223 0 <nl> + vt 0 . 62133 0 . 98202 0 <nl> + vt 0 . 369034 0 . 609455 0 <nl> + vt 0 . 380177 0 . 167709 0 <nl> + vt 0 . 347655 0 . 179822 0 <nl> + vt 0 . 369767 0 . 039595 0 <nl> + vt 0 . 346915 0 . 033192 0 <nl> + vt 0 . 396334 0 . 040637 0 <nl> + vt 0 . 346793 0 . 00661 0 <nl> + vt 0 . 406674 0 . 167689 0 <nl> + vt 0 . 34778 0 . 206333 0 <nl> + vt 0 . 400506 0 . 092061 0 <nl> + vt 0 . 34714 0 . 076348 0 <nl> + vt 0 . 347422 0 . 129521 0 <nl> + vt 0 . 25309 0 . 155811 0 <nl> + vt 0 . 986632 0 . 334252 0 <nl> + vt 0 . 900869 0 . 480587 0 <nl> + vt 0 . 178263 0 . 12975 0 <nl> + vt 0 . 948411 0 . 446335 0 <nl> + vt 0 . 938762 0 . 317929 0 <nl> + vt 0 . 90054 0 . 43001 0 <nl> + vt 0 . 726249 0 . 319303 0 <nl> + vt 0 . 753116 0 . 430966 0 <nl> + vt 0 . 253094 0 . 013616 0 <nl> + vt 0 . 677076 0 . 331135 0 <nl> + vt 0 . 753444 0 . 48154 0 <nl> + vt 0 . 178266 0 . 031107 0 <nl> + vt 0 . 703943 0 . 442796 0 <nl> + vt 0 . 612474 0 . 98263 0 <nl> + vt 0 . 34598 0 . 618839 0 <nl> + vt 0 . 581161 0 . 967031 0 <nl> + vt 0 . 323125 0 . 60923 0 <nl> + vt 0 . 577236 0 . 974932 0 <nl> + vt 0 . 301895 0 . 494844 0 <nl> + vt 0 . 57263 0 . 969518 0 <nl> + vt 0 . 510333 0 . 226098 0 <nl> + vt 0 . 382299 0 . 360197 0 <nl> + vt 0 . 667065 0 . 356807 0 <nl> + vt 0 . 610495 0 . 598294 0 <nl> + vt 0 . 614647 0 . 607502 0 <nl> + vt 0 . 360782 0 . 383711 0 <nl> + vt 0 . 601286 0 . 608074 0 <nl> + vt 0 . 946295 0 . 240423 0 <nl> + vt 0 . 661994 0 . 243219 0 <nl> + vt 0 . 991137 0 . 240398 0 <nl> + vt 0 . 701254 0 . 243258 0 <nl> + vt 0 . 739885 0 . 243356 0 <nl> + vt 0 . 778704 0 . 243132 0 <nl> + vt 0 . 818178 0 . 242671 0 <nl> + vt 0 . 858856 0 . 241693 0 <nl> + vt 0 . 90173 0 . 240871 0 <nl> + vt 0 . 973266 0 . 207191 0 <nl> + vt 0 . 94624 0 . 287074 0 <nl> + vt 0 . 911901 0 . 23261 0 <nl> + vt 0 . 662047 0 . 284293 0 <nl> + vt 0 . 991082 0 . 287208 0 <nl> + vt 0 . 850535 0 . 207191 0 <nl> + vt 0 . 701289 0 . 284167 0 <nl> + vt 0 . 825117 0 . 145826 0 <nl> + vt 0 . 739912 0 . 284018 0 <nl> + vt 0 . 850535 0 . 084461 0 <nl> + vt 0 . 778729 0 . 284198 0 <nl> + vt 0 . 911901 0 . 059042 0 <nl> + vt 0 . 818183 0 . 284624 0 <nl> + vt 0 . 973266 0 . 084461 0 <nl> + vt 0 . 858836 0 . 28562 0 <nl> + vt 0 . 998684 0 . 145826 0 <nl> + vt 0 . 901683 0 . 286519 0 <nl> + vt 0 . 911901 0 . 142355 0 <nl> + vt 0 . 520712 0 . 441362 0 <nl> + vt 0 . 565962 0 . 396112 0 <nl> + vt 0 . 656461 0 . 441362 0 <nl> + vt 0 . 611211 0 . 396112 0 <nl> + vt 0 . 565962 0 . 441362 0 <nl> + vt 0 . 611211 0 . 441362 0 <nl> + vt 0 . 565962 0 . 486611 0 <nl> + vt 0 . 611211 0 . 486611 0 <nl> + vt 0 . 520712 0 . 486611 0 <nl> + vt 0 . 565962 0 . 531861 0 <nl> + vt 0 . 656461 0 . 486611 0 <nl> + vt 0 . 611211 0 . 531861 0 <nl> + vt 0 . 352159 0 . 224968 0 <nl> + vt 0 . 355175 0 . 224967 0 <nl> + vt 0 . 35819 0 . 224967 0 <nl> + vt 0 . 361206 0 . 224968 0 <nl> + vt 0 . 364222 0 . 224968 0 <nl> + vt 0 . 343112 0 . 224967 0 <nl> + vt 0 . 367238 0 . 224968 0 <nl> + vt 0 . 346128 0 . 224967 0 <nl> + vt 0 . 349143 0 . 224968 0 <nl> + vt 0 . 328345 0 . 296397 0 <nl> + vt 0 . 352159 0 . 264994 0 <nl> + vt 0 . 316111 0 . 301074 0 <nl> + vt 0 . 355175 0 . 264994 0 <nl> + vt 0 . 304153 0 . 295731 0 <nl> + vt 0 . 35819 0 . 264994 0 <nl> + vt 0 . 299475 0 . 283498 0 <nl> + vt 0 . 361206 0 . 264994 0 <nl> + vt 0 . 304818 0 . 271539 0 <nl> + vt 0 . 364222 0 . 264994 0 <nl> + vt 0 . 317052 0 . 266862 0 <nl> + vt 0 . 343112 0 . 264994 0 <nl> + vt 0 . 367238 0 . 264994 0 <nl> + vt 0 . 32901 0 . 272205 0 <nl> + vt 0 . 346128 0 . 264994 0 <nl> + vt 0 . 333688 0 . 284439 0 <nl> + vt 0 . 349143 0 . 264994 0 <nl> + vt 0 . 316582 0 . 283968 0 <nl> + vt 0 . 312838 0 . 224509 0 <nl> + vt 0 . 315906 0 . 22444 0 <nl> + vt 0 . 318977 0 . 22437 0 <nl> + vt 0 . 322049 0 . 224296 0 <nl> + vt 0 . 325124 0 . 22422 0 <nl> + vt 0 . 303636 0 . 224704 0 <nl> + vt 0 . 328202 0 . 224144 0 <nl> + vt 0 . 306703 0 . 22464 0 <nl> + vt 0 . 30977 0 . 224575 0 <nl> + vt 0 . 368307 0 . 296009 0 <nl> + vt 0 . 313643 0 . 265231 0 <nl> + vt 0 . 356074 0 . 300686 0 <nl> + vt 0 . 316705 0 . 265169 0 <nl> + vt 0 . 344115 0 . 295343 0 <nl> + vt 0 . 319768 0 . 265108 0 <nl> + vt 0 . 339438 0 . 28311 0 <nl> + vt 0 . 32283 0 . 26505 0 <nl> + vt 0 . 344781 0 . 271151 0 <nl> + vt 0 . 325893 0 . 264994 0 <nl> + vt 0 . 357015 0 . 266474 0 <nl> + vt 0 . 304451 0 . 265411 0 <nl> + vt 0 . 32922 0 . 264994 0 <nl> + vt 0 . 368973 0 . 271817 0 <nl> + vt 0 . 307516 0 . 265351 0 <nl> + vt 0 . 37365 0 . 284051 0 <nl> + vt 0 . 31058 0 . 265291 0 <nl> + vt 0 . 356544 0 . 28358 0 <nl> + vt 0 . 538458 0 . 400243 0 <nl> + vt 0 . 488848 0 . 450839 0 <nl> + vt 0 . 608538 0 . 990523 0 <nl> + vt 0 . 29194 0 . 529223 0 <nl> + vt 0 . 62133 0 . 98202 0 <nl> + vt 0 . 594713 0 . 724759 0 <nl> + vt 0 . 612474 0 . 98263 0 <nl> + vt 0 . 49603 0 . 675106 0 <nl> + vt 0 . 581161 0 . 967031 0 <nl> + vt 0 . 142475 0 . 228861 0 <nl> + vt 0 . 476527 0 . 680791 0 <nl> + vt 0 . 577236 0 . 974932 0 <nl> + vt 0 . 301895 0 . 494844 0 <nl> + vt 0 . 57263 0 . 969518 0 <nl> + vt 0 . 367986 0 . 565002 0 <nl> + vt 0 . 425478 0 . 616457 0 <nl> + vt 0 . 425848 0 . 486287 0 <nl> + vt 0 . 667065 0 . 356807 0 <nl> + vt 0 . 610495 0 . 598294 0 <nl> + vt 0 . 614647 0 . 607502 0 <nl> + vt 0 . 345685 0 . 555992 0 <nl> + vt 0 . 425794 0 . 505287 0 <nl> + vt 0 . 601286 0 . 608074 0 <nl> + vt 0 . 374237 0 . 635974 0 <nl> + vt 0 . 603553 0 . 660983 0 <nl> + vt 0 . 324555 0 . 565556 0 <nl> + vt 0 . 425737 0 . 525603 0 <nl> + vt 0 . 670709 0 . 390276 0 <nl> + vt 0 . 602008 0 . 674295 0 <nl> + vt 0 . 616898 0 . 660405 0 <nl> + vt 0 . 059939 0 . 122085 0 <nl> + vt 0 . 687668 0 . 499238 0 <nl> + vt 0 . 045477 0 . 509967 0 <nl> + vt 0 . 008219 0 . 122247 0 <nl> + vt 0 . 636899 0 . 498768 0 <nl> + vt 0 . 008104 0 . 053923 0 <nl> + vt 0 . 316467 0 . 586764 0 <nl> + vt 0 . 425678 0 . 546256 0 <nl> + vt 0 . 325297 0 . 607393 0 <nl> + vt 0 . 425622 0 . 565813 0 <nl> + vt 0 . 345968 0 . 616042 0 <nl> + vt 0 . 425573 0 . 583176 0 <nl> + vt 0 . 008828 0 . 913903 0 <nl> + vt 0 . 008828 0 . 991382 0 <nl> + vt 0 . 636121 0 . 986565 0 <nl> + vt 0 . 007736 0 . 358786 0 <nl> + vt 0 . 007736 0 . 137802 0 <nl> + vt 0 . 007736 0 . 157777 0 <nl> + vt 0 . 007736 0 . 222377 0 <nl> + vt 0 . 007736 0 . 284298 0 <nl> + vt 0 . 007736 0 . 316526 0 <nl> + vt 0 . 366961 0 . 607857 0 <nl> + vt 0 . 425532 0 . 597655 0 <nl> + vt 0 . 376419 0 . 586974 0 <nl> + vt 0 . 4255 0 . 608967 0 <nl> + vt 0 . 372567 0 . 613026 0 <nl> + vt 0 . 418233 0 . 616858 0 <nl> + vt 0 . 418604 0 . 486279 0 <nl> + vt 0 . 345949 0 . 623829 0 <nl> + vt 0 . 41855 0 . 505269 0 <nl> + vt 0 . 319594 0 . 612732 0 <nl> + vt 0 . 418492 0 . 525551 0 <nl> + vt 0 . 389044 0 . 29016 0 <nl> + vt 0 . 137994 0 . 570166 0 <nl> + vt 0 . 390497 0 . 210232 0 <nl> + vt 0 . 557298 0 . 26537 0 <nl> + vt 0 . 453183 0 . 43316 0 <nl> + vt 0 . 435459 0 . 452036 0 <nl> + vt 0 . 443424 0 . 642622 0 <nl> + vt 0 . 569111 0 . 384092 0 <nl> + vt 0 . 44067 0 . 668067 0 <nl> + vt 0 . 308742 0 . 586347 0 <nl> + vt 0 . 418434 0 . 546192 0 <nl> + vt 0 . 319631 0 . 559984 0 <nl> + vt 0 . 418378 0 . 565797 0 <nl> + vt 0 . 26567 0 . 007003 0 <nl> + vt 0 . 265811 0 . 033587 0 <nl> + vt 0 . 345967 0 . 548943 0 <nl> + vt 0 . 418328 0 . 583226 0 <nl> + vt 0 . 372506 0 . 559731 0 <nl> + vt 0 . 418287 0 . 597784 0 <nl> + vt 0 . 400909 0 . 096914 0 <nl> + vt 0 . 901262 0 . 530297 0 <nl> + vt 0 . 945558 0 . 536298 0 <nl> + vt 0 . 938872 0 . 531149 0 <nl> + vt 0 . 383698 0 . 586308 0 <nl> + vt 0 . 418254 0 . 609248 0 <nl> + vt 0 . 902345 0 . 986421 0 <nl> + vt 0 . 359357 0 . 573792 0 <nl> + vt 0 . 813927 0 . 986075 0 <nl> + vt 0 . 809312 0 . 573689 0 <nl> + vt 0 . 812099 0 . 56775 0 <nl> + vt 0 . 853688 0 . 529528 0 <nl> + vt 0 . 848087 0 . 53162 0 <nl> + vt 0 . 900755 0 . 538571 0 <nl> + vt 0 . 904638 0 . 649276 0 <nl> + vt 0 . 937884 0 . 539507 0 <nl> + vt 0 . 987257 0 . 649743 0 <nl> + vt 0 . 90173 0 . 978186 0 <nl> + vt 0 . 984307 0 . 979178 0 <nl> + vt 0 . 816956 0 . 648322 0 <nl> + vt 0 . 813964 0 . 977666 0 <nl> + vt 0 . 81769 0 . 573982 0 <nl> + vt 0 . 853542 0 . 537896 0 <nl> + vt 0 . 808549 0 . 64825 0 <nl> + vt 0 . 994729 0 . 751596 0 <nl> + vt 0 . 986429 0 . 751521 0 <nl> + vt 0 . 903756 0 . 750787 0 <nl> + vt 0 . 815903 0 . 749985 0 <nl> + vt 0 . 807509 0 . 749992 0 <nl> + vt 0 . 059939 0 . 122085 0 <nl> + vt 0 . 687668 0 . 499238 0 <nl> + vt 0 . 346162 0 . 586441 0 <nl> + vt 0 . 345869 0 . 568161 0 <nl> + vt 0 . 062187 0 . 98965 0 <nl> + vt 0 . 69945 0 . 98606 0 <nl> + vt 0 . 346673 0 . 542322 0 <nl> + vt 0 . 128965 0 . 974582 0 <nl> + vt 0 . 782818 0 . 981712 0 <nl> + vt 0 . 333221 0 . 573771 0 <nl> + vt 0 . 328226 0 . 586552 0 <nl> + vt 0 . 687993 0 . 503583 0 <nl> + vt 0 . 69842 0 . 750594 0 <nl> + vt 0 . 727594 0 . 498641 0 <nl> + vt 0 . 780939 0 . 750999 0 <nl> + vt 0 . 995564 0 . 649813 0 <nl> + vt 0 . 994931 0 . 646535 0 <nl> + vt 0 . 699276 0 . 981779 0 <nl> + vt 0 . 779679 0 . 980604 0 <nl> + vt 0 . 992605 0 . 979257 0 <nl> + vt 0 . 985632 0 . 987425 0 <nl> + vt 0 . 634522 0 . 750265 0 <nl> + vt 0 . 333547 0 . 599086 0 <nl> + vt 0 . 346093 0 . 604325 0 <nl> + vt 0 . 05879 0 . 007778 0 <nl> + vt 0 . 047272 0 . 488901 0 <nl> + vt 0 . 058235 0 . 053941 0 <nl> + vt 0 . 358792 0 . 599285 0 <nl> + vt 0 . 057779 0 . 913566 0 <nl> + vt 0 . 407615 0 . 505451 0 <nl> + vt 0 . 123087 0 . 916212 0 <nl> + vt 0 . 364368 0 . 586675 0 <nl> + vt 0 . 224808 0 . 340362 0 <nl> + vt 0 . 785169 0 . 750557 0 <nl> + vt 0 . 058749 0 . 73063 0 <nl> + vt 0 . 28587 0 . 303495 0 <nl> + vt 0 . 124342 0 . 730754 0 <nl> + vt 0 . 125459 0 . 063828 0 <nl> + vt 0 . 0814 0 . 510898 0 <nl> + vt 0 . 102683 0 . 029981 0 <nl> + vt 0 . 073324 0 . 01374 0 <nl> + vt 0 . 05933 0 . 488428 0 <nl> + vt 0 . 099108 0 . 116354 0 <nl> + vt 0 . 731869 0 . 49777 0 <nl> + vt 0 . 726871 0 . 494355 0 <nl> + vt 0 . 072323 0 . 053475 0 <nl> + vt 0 . 193953 0 . 981583 0 <nl> + vt 0 . 424823 0 . 351441 0 <nl> + vt 0 . 188639 0 . 887683 0 <nl> + vt 0 . 199784 0 . 698522 0 <nl> + vt 0 . 438044 0 . 211097 0 <nl> + vt 0 . 20532 0 . 571215 0 <nl> + vt 0 . 384199 0 . 711565 0 <nl> + vt 0 . 500316 0 . 212631 0 <nl> + vt 0 . 290876 0 . 593575 0 <nl> + vt 0 . 258604 0 . 963636 0 <nl> + vt 0 . 467461 0 . 353125 0 <nl> + vt 0 . 318819 0 . 910112 0 <nl> + vt 0 . 283877 0 . 695369 0 <nl> + vt 0 . 252001 0 . 887726 0 <nl> + vt 0 . 275255 0 . 80017 0 <nl> + vt 0 . 19945 0 . 803168 0 <nl> + vt 0 . 436354 0 . 290608 0 <nl> + vt 0 . 3662 0 . 823057 0 <nl> + vt 0 . 498348 0 . 292484 0 <nl> + vt 0 . 495948 0 . 957021 0 <nl> + vt 0 . 10292 0 . 392065 0 <nl> + vt 0 . 45675 0 . 997198 0 <nl> + vt 0 . 375916 0 . 956447 0 <nl> + vt 0 . 075154 0 . 42042 0 <nl> + vt 0 . 416227 0 . 997221 0 <nl> + vt 0 . 456712 0 . 956816 0 <nl> + vt 0 . 416225 0 . 956806 0 <nl> + vt 0 . 456172 0 . 82355 0 <nl> + vt 0 . 416731 0 . 824647 0 <nl> + vt 0 . 496678 0 . 822937 0 <nl> + vt 0 . 196696 0 . 483704 0 <nl> + vt 0 . 169196 0 . 512305 0 <nl> + vt 0 . 377041 0 . 822595 0 <nl> + vt 0 . 452832 0 . 768161 0 <nl> + vt 0 . 425823 0 . 769999 0 <nl> + vt 0 . 218443 0 . 537816 0 <nl> + vt 0 . 384197 0 . 764756 0 <nl> + vt 0 . 422662 0 . 726694 0 <nl> + vt 0 . 49481 0 . 766707 0 <nl> + vt 0 . 23535 0 . 519557 0 <nl> + vt 0 . 449921 0 . 724799 0 <nl> + vt 0 . 095834 0 . 208772 0 <nl> + vt 0 . 057027 0 . 147654 0 <nl> + vt 0 . 039343 0 . 137854 0 <nl> + vt 0 . 062632 0 . 222927 0 <nl> + vt 0 . 039308 0 . 158849 0 <nl> + vt 0 . 04078 0 . 315102 0 <nl> + vt 0 . 070835 0 . 280228 0 <nl> + vt 0 . 102932 0 . 307938 0 <nl> + vt 0 . 110762 0 . 270579 0 <nl> + vt 0 . 072792 0 . 342824 0 <nl> + vt 0 . 041282 0 . 358462 0 <nl> + vt 0 . 313711 0 . 586352 0 <nl> + vt 0 . 603553 0 . 660983 0 <nl> + vt 0 . 525739 0 . 381449 0 <nl> + vt 0 . 371282 0 . 666665 0 <nl> + vt 0 . 670709 0 . 390276 0 <nl> + vt 0 . 602008 0 . 674295 0 <nl> + vt 0 . 616898 0 . 660405 0 <nl> + vt 0 . 323155 0 . 563492 0 <nl> + vt 0 . 045477 0 . 509967 0 <nl> + vt 0 . 345996 0 . 553927 0 <nl> + vt 0 . 368994 0 . 563294 0 <nl> + vt 0 . 007243 0 . 008448 0 <nl> + vt 0 . 008828 0 . 488425 0 <nl> + vt 0 . 008828 0 . 509895 0 <nl> + vt 0 . 008828 0 . 730482 0 <nl> + vt 0 . 378658 0 . 586315 0 <nl> + vt 0 . 359372 0 . 599752 0 <nl> + vt 0 . 346081 0 . 586365 0 <nl> + vt 0 . 346045 0 . 605197 0 <nl> + vt 0 . 332779 0 . 599642 0 <nl> + vt 0 . 327306 0 . 586362 0 <nl> + vt 0 . 380177 0 . 167709 0 <nl> + vt 0 . 347655 0 . 179822 0 <nl> + vt 0 . 332793 0 . 573092 0 <nl> + vt 0 . 346054 0 . 567553 0 <nl> + vt 0 . 137994 0 . 695528 0 <nl> + vt 0 . 137994 0 . 804199 0 <nl> + vt 0 . 137994 0 . 891424 0 <nl> + vt 0 . 369767 0 . 039595 0 <nl> + vt 0 . 346915 0 . 033192 0 <nl> + vt 0 . 396334 0 . 040637 0 <nl> + vt 0 . 346793 0 . 00661 0 <nl> + vt 0 . 389055 0 . 351447 0 <nl> + vt 0 . 137994 0 . 982716 0 <nl> + vt 0 . 359376 0 . 573 0 <nl> + vt 0 . 36494 0 . 586271 0 <nl> + vt 0 . 557298 0 . 26537 0 <nl> + vt 0 . 453183 0 . 43316 0 <nl> + vt 0 . 435459 0 . 452036 0 <nl> + vt 0 . 443424 0 . 642622 0 <nl> + vt 0 . 569111 0 . 384092 0 <nl> + vt 0 . 44067 0 . 668067 0 <nl> + vt 0 . 266302 0 . 129883 0 <nl> + vt 0 . 266035 0 . 076773 0 <nl> + <nl> + f 209 / 327 342 / 531 208 / 326 206 / 322 205 / 320 <nl> + f 452 / 688 38 / 75 109 / 161 39 / 76 451 / 686 <nl> + f 1 / 2 2 / 4 3 / 6 4 / 8 <nl> + f 2 / 4 5 / 10 6 / 12 3 / 6 <nl> + f 5 / 10 7 / 14 8 / 16 6 / 12 <nl> + f 7 / 14 9 / 18 10 / 20 8 / 16 <nl> + f 9 / 18 11 / 23 12 / 26 10 / 20 <nl> + f 11 / 22 13 / 28 14 / 30 12 / 25 <nl> + f 13 / 28 15 / 32 16 / 34 14 / 30 <nl> + f 15 / 32 1 / 2 4 / 8 16 / 34 <nl> + f 4 / 7 3 / 5 17 / 35 <nl> + f 3 / 5 6 / 11 17 / 35 <nl> + f 6 / 11 8 / 15 17 / 35 <nl> + f 8 / 15 10 / 19 17 / 35 <nl> + f 10 / 19 12 / 24 17 / 35 <nl> + f 12 / 24 14 / 29 17 / 35 <nl> + f 14 / 29 16 / 33 17 / 35 <nl> + f 16 / 33 4 / 7 17 / 35 <nl> + f 5 / 9 2 / 3 18 / 36 <nl> + f 18 / 36 2 / 3 1 / 1 <nl> + f 11 / 21 18 / 36 13 / 27 <nl> + f 9 / 17 18 / 36 11 / 21 <nl> + f 5 / 9 18 / 36 7 / 13 <nl> + f 7 / 13 18 / 36 9 / 17 <nl> + f 13 / 27 18 / 36 15 / 31 <nl> + f 15 / 31 18 / 36 1 / 1 <nl> + f 19 / 38 22 / 44 21 / 42 20 / 40 <nl> + f 20 / 40 21 / 42 24 / 48 23 / 46 <nl> + f 23 / 46 24 / 48 26 / 52 25 / 50 <nl> + f 25 / 50 26 / 52 28 / 56 27 / 54 <nl> + f 27 / 54 28 / 56 30 / 62 29 / 59 <nl> + f 29 / 58 30 / 61 32 / 66 31 / 64 <nl> + f 31 / 64 32 / 66 34 / 70 33 / 68 <nl> + f 33 / 68 34 / 70 22 / 44 19 / 38 <nl> + f 22 / 43 35 / 71 21 / 41 <nl> + f 21 / 41 35 / 71 24 / 47 <nl> + f 24 / 47 35 / 71 26 / 51 <nl> + f 26 / 51 35 / 71 28 / 55 <nl> + f 28 / 55 35 / 71 30 / 60 <nl> + f 30 / 60 35 / 71 32 / 65 <nl> + f 32 / 65 35 / 71 34 / 69 <nl> + f 34 / 69 35 / 71 22 / 43 <nl> + f 23 / 45 36 / 72 20 / 39 <nl> + f 36 / 72 19 / 37 20 / 39 <nl> + f 29 / 57 31 / 63 36 / 72 <nl> + f 27 / 53 29 / 57 36 / 72 <nl> + f 23 / 45 25 / 49 36 / 72 <nl> + f 25 / 49 27 / 53 36 / 72 <nl> + f 31 / 63 33 / 67 36 / 72 <nl> + f 33 / 67 19 / 37 36 / 72 <nl> + f 452 / 689 451 / 687 339 / 526 338 / 525 <nl> + f 451 / 687 39 / 76 461 / 701 339 / 526 <nl> + f 445 / 680 37 / 74 87 / 137 89 / 139 <nl> + f 40 / 77 445 / 680 89 / 139 460 / 700 <nl> + f 39 / 76 109 / 161 40 / 77 <nl> + f 40 / 77 109 / 161 37 / 73 445 / 679 <nl> + f 110 / 163 111 / 165 114 / 169 113 / 168 <nl> + f 113 / 168 114 / 169 122 / 181 115 / 170 <nl> + f 115 / 170 122 / 181 295 / 451 127 / 188 <nl> + f 111 / 164 295 / 450 122 / 181 114 / 169 <nl> + f 127 / 187 110 / 162 113 / 168 115 / 170 <nl> + f 327 / 507 303 / 466 305 / 471 328 / 509 <nl> + f 328 / 509 305 / 471 309 / 476 329 / 511 <nl> + f 75 / 122 77 / 124 79 / 126 81 / 130 <nl> + f 80 / 128 78 / 125 76 / 123 74 / 120 <nl> + f 82 / 131 175 / 268 176 / 270 83 / 132 <nl> + f 83 / 132 176 / 270 177 / 272 84 / 133 <nl> + f 84 / 133 177 / 272 178 / 274 170 / 261 <nl> + f 170 / 261 178 / 274 179 / 276 171 / 262 <nl> + f 171 / 262 179 / 276 180 / 279 172 / 264 <nl> + f 172 / 263 180 / 278 181 / 281 173 / 265 <nl> + f 173 / 265 181 / 281 182 / 283 174 / 266 <nl> + f 174 / 266 182 / 283 175 / 268 82 / 131 <nl> + f 175 / 267 183 / 284 176 / 269 <nl> + f 176 / 269 183 / 284 177 / 271 <nl> + f 177 / 271 183 / 284 178 / 273 <nl> + f 178 / 273 183 / 284 179 / 275 <nl> + f 179 / 275 183 / 284 180 / 277 <nl> + f 180 / 277 183 / 284 181 / 280 <nl> + f 94 / 146 93 / 145 95 / 147 96 / 148 <nl> + f 106 / 158 94 / 146 96 / 148 105 / 157 <nl> + f 99 / 151 94 / 146 106 / 158 107 / 159 <nl> + f 99 / 151 101 / 153 94 / 146 <nl> + f 85 / 134 86 / 136 95 / 147 93 / 145 <nl> + f 86 / 135 119 / 176 96 / 148 95 / 147 <nl> + f 119 / 175 104 / 156 105 / 157 96 / 148 <nl> + f 121 / 180 88 / 138 97 / 149 98 / 150 <nl> + f 88 / 138 90 / 140 100 / 152 97 / 149 <nl> + f 91 / 142 92 / 144 102 / 154 101 / 153 <nl> + f 92 / 143 85 / 134 93 / 145 102 / 154 <nl> + f 99 / 151 107 / 159 108 / 160 103 / 155 <nl> + f 101 / 153 99 / 151 103 / 155 91 / 141 <nl> + f 104 / 156 121 / 179 98 / 150 105 / 157 <nl> + f 97 / 149 106 / 158 105 / 157 98 / 150 <nl> + f 107 / 159 106 / 158 97 / 149 100 / 152 <nl> + f 117 / 172 116 / 171 118 / 173 119 / 174 <nl> + f 120 / 177 117 / 172 119 / 174 121 / 178 <nl> + f 380 / 581 117 / 172 120 / 177 123 / 182 <nl> + f 380 / 581 124 / 183 116 / 171 117 / 172 <nl> + f 311 / 481 136 / 207 118 / 173 116 / 171 <nl> + f 136 / 206 131 / 196 119 / 174 118 / 173 <nl> + f 131 / 196 130 / 194 121 / 178 119 / 174 <nl> + f 130 / 194 112 / 167 120 / 177 121 / 178 <nl> + f 112 / 167 319 / 494 123 / 182 120 / 177 <nl> + f 313 / 484 311 / 481 116 / 171 124 / 183 <nl> + f 436 / 669 125 / 185 126 / 186 314 / 485 <nl> + f 314 / 485 126 / 186 311 / 480 313 / 483 <nl> + f 319 / 493 112 / 166 128 / 189 318 / 492 <nl> + f 438 / 672 132 / 197 312 / 482 437 / 671 <nl> + f 136 / 205 134 / 201 133 / 199 131 / 195 <nl> + f 125 / 184 312 / 482 134 / 200 135 / 204 <nl> + f 128 / 189 112 / 166 130 / 193 129 / 191 <nl> + f 126 / 186 125 / 185 135 / 203 137 / 208 <nl> + f 318 / 492 128 / 189 132 / 197 438 / 672 <nl> + f 133 / 198 132 / 197 128 / 189 129 / 191 <nl> + f 131 / 195 133 / 199 129 / 190 130 / 192 <nl> + f 135 / 202 134 / 201 136 / 205 137 / 208 <nl> + f 143 / 220 145 / 222 146 / 223 149 / 226 <nl> + f 138 / 209 143 / 219 149 / 227 148 / 225 <nl> + f 141 / 213 142 / 217 144 / 221 140 / 212 <nl> + f 147 / 224 146 / 223 145 / 222 139 / 211 <nl> + f 139 / 211 145 / 222 143 / 218 138 / 210 <nl> + f 140 / 212 144 / 221 146 / 223 147 / 224 <nl> + f 149 / 227 142 / 216 141 / 214 148 / 225 <nl> + f 146 / 223 144 / 221 142 / 215 149 / 226 <nl> + f 150 / 230 151 / 233 153 / 235 152 / 234 <nl> + f 152 / 234 153 / 235 155 / 237 154 / 236 <nl> + f 158 / 242 159 / 243 160 / 246 161 / 249 <nl> + f 156 / 239 157 / 240 151 / 232 150 / 229 <nl> + f 151 / 231 157 / 241 155 / 237 153 / 235 <nl> + f 156 / 238 150 / 228 152 / 234 154 / 236 <nl> + f 154 / 236 155 / 237 159 / 243 158 / 242 <nl> + f 155 / 237 157 / 241 160 / 245 159 / 243 <nl> + f 157 / 240 156 / 239 161 / 248 160 / 244 <nl> + f 156 / 238 154 / 236 158 / 242 161 / 247 <nl> + f 164 / 253 162 / 250 168 / 258 167 / 256 <nl> + f 163 / 252 162 / 250 164 / 253 165 / 254 <nl> + f 166 / 255 167 / 256 168 / 257 169 / 260 <nl> + f 181 / 280 183 / 284 182 / 282 <nl> + f 182 / 282 183 / 284 175 / 267 <nl> + f 184 / 285 192 / 295 193 / 297 185 / 286 <nl> + f 185 / 286 193 / 297 194 / 299 186 / 287 <nl> + f 186 / 287 194 / 299 195 / 301 187 / 288 <nl> + f 187 / 288 195 / 301 196 / 303 188 / 289 <nl> + f 188 / 289 196 / 303 197 / 306 189 / 291 <nl> + f 189 / 290 197 / 305 198 / 308 190 / 292 <nl> + f 190 / 292 198 / 308 199 / 310 191 / 293 <nl> + f 191 / 293 199 / 310 192 / 295 184 / 285 <nl> + f 192 / 294 200 / 311 193 / 296 <nl> + f 193 / 296 200 / 311 194 / 298 <nl> + f 194 / 298 200 / 311 195 / 300 <nl> + f 195 / 300 200 / 311 196 / 302 <nl> + f 196 / 302 200 / 311 197 / 304 <nl> + f 197 / 304 200 / 311 198 / 307 <nl> + f 198 / 307 200 / 311 199 / 309 <nl> + f 199 / 309 200 / 311 192 / 294 <nl> + f 76 / 123 78 / 125 79 / 126 77 / 124 <nl> + f 227 / 343 202 / 316 201 / 313 297 / 455 <nl> + f 299 / 457 229 / 345 227 / 343 297 / 455 <nl> + f 301 / 460 231 / 349 229 / 345 299 / 457 <nl> + f 201 / 312 202 / 315 231 / 348 301 / 459 <nl> + f 202 / 314 227 / 343 229 / 345 231 / 347 <nl> + f 232 / 351 234 / 355 457 / 696 456 / 695 <nl> + f 307 / 473 430 / 661 459 / 699 458 / 697 <nl> + f 430 / 660 232 / 350 456 / 694 459 / 698 <nl> + f 233 / 354 235 / 356 429 / 659 431 / 664 <nl> + f 394 / 602 395 / 605 384 / 586 367 / 560 <nl> + f 437 / 671 436 / 670 383 / 585 433 / 666 <nl> + f 392 / 598 391 / 596 390 / 594 433 / 666 <nl> + f 321 / 497 423 / 651 421 / 649 320 / 496 <nl> + f 211 / 330 212 / 333 214 / 335 213 / 334 <nl> + f 213 / 334 214 / 335 216 / 337 215 / 336 <nl> + f 215 / 336 216 / 337 218 / 342 217 / 339 <nl> + f 217 / 338 218 / 341 212 / 332 211 / 329 <nl> + f 212 / 331 218 / 340 216 / 337 214 / 335 <nl> + f 322 / 498 422 / 650 423 / 651 321 / 497 <nl> + f 323 / 499 425 / 653 422 / 650 322 / 498 <nl> + f 324 / 500 424 / 652 425 / 653 323 / 499 <nl> + f 319 / 495 427 / 657 424 / 652 324 / 500 <nl> + f 449 / 684 405 / 621 398 / 609 448 / 683 <nl> + f 450 / 685 397 / 608 405 / 621 449 / 684 <nl> + f 453 / 691 396 / 606 397 / 608 450 / 685 <nl> + f 330 / 512 406 / 622 396 / 607 453 / 690 <nl> + f 331 / 514 399 / 610 406 / 622 330 / 512 <nl> + f 448 / 683 398 / 609 399 / 611 331 / 513 <nl> + f 456 / 695 457 / 696 235 / 356 233 / 353 <nl> + f 458 / 697 429 / 659 235 / 356 457 / 696 <nl> + f 459 / 699 431 / 663 429 / 659 458 / 697 <nl> + f 78 / 125 80 / 127 81 / 129 79 / 126 <nl> + f 456 / 694 233 / 352 431 / 662 459 / 698 <nl> + f 39 / 76 40 / 77 460 / 700 461 / 701 <nl> + f 236 / 357 237 / 359 245 / 370 244 / 367 <nl> + f 237 / 358 238 / 360 246 / 372 245 / 369 <nl> + f 238 / 360 239 / 361 247 / 374 246 / 372 <nl> + f 239 / 361 240 / 362 248 / 376 247 / 374 <nl> + f 240 / 362 241 / 363 249 / 378 248 / 376 <nl> + f 241 / 363 242 / 364 250 / 380 249 / 378 <nl> + f 242 / 364 243 / 365 251 / 382 250 / 380 <nl> + f 243 / 365 236 / 357 244 / 367 251 / 382 <nl> + f 244 / 366 245 / 368 252 / 383 <nl> + f 245 / 368 246 / 371 252 / 383 <nl> + f 246 / 371 247 / 373 252 / 383 <nl> + f 247 / 373 248 / 375 252 / 383 <nl> + f 248 / 375 249 / 377 252 / 383 <nl> + f 249 / 377 250 / 379 252 / 383 <nl> + f 250 / 379 251 / 381 252 / 383 <nl> + f 251 / 381 244 / 366 252 / 383 <nl> + f 253 / 385 254 / 387 256 / 389 255 / 388 <nl> + f 255 / 388 256 / 389 258 / 391 257 / 390 <nl> + f 257 / 390 258 / 391 260 / 395 259 / 393 <nl> + f 254 / 386 260 / 394 258 / 391 256 / 389 <nl> + f 259 / 392 253 / 384 255 / 388 257 / 390 <nl> + f 261 / 396 262 / 397 270 / 408 269 / 406 <nl> + f 262 / 397 263 / 398 271 / 410 270 / 408 <nl> + f 263 / 398 264 / 399 272 / 412 271 / 410 <nl> + f 264 / 399 265 / 400 273 / 414 272 / 412 <nl> + f 265 / 400 266 / 402 274 / 417 273 / 414 <nl> + f 266 / 401 267 / 403 275 / 419 274 / 416 <nl> + f 267 / 403 268 / 404 276 / 421 275 / 419 <nl> + f 268 / 404 261 / 396 269 / 406 276 / 421 <nl> + f 269 / 405 270 / 407 277 / 422 <nl> + f 270 / 407 271 / 409 277 / 422 <nl> + f 271 / 409 272 / 411 277 / 422 <nl> + f 272 / 411 273 / 413 277 / 422 <nl> + f 273 / 413 274 / 415 277 / 422 <nl> + f 274 / 415 275 / 418 277 / 422 <nl> + f 275 / 418 276 / 420 277 / 422 <nl> + f 276 / 420 269 / 405 277 / 422 <nl> + f 278 / 423 279 / 424 287 / 435 286 / 433 <nl> + f 279 / 424 280 / 425 288 / 437 287 / 435 <nl> + f 280 / 425 281 / 426 289 / 439 288 / 437 <nl> + f 281 / 426 282 / 427 290 / 441 289 / 439 <nl> + f 282 / 427 283 / 429 291 / 444 290 / 441 <nl> + f 283 / 428 284 / 430 292 / 446 291 / 443 <nl> + f 284 / 430 285 / 431 293 / 448 292 / 446 <nl> + f 285 / 431 278 / 423 286 / 433 293 / 448 <nl> + f 286 / 432 287 / 434 294 / 449 <nl> + f 287 / 434 288 / 436 294 / 449 <nl> + f 288 / 436 289 / 438 294 / 449 <nl> + f 289 / 438 290 / 440 294 / 449 <nl> + f 290 / 440 291 / 442 294 / 449 <nl> + f 291 / 442 292 / 445 294 / 449 <nl> + f 292 / 445 293 / 447 294 / 449 <nl> + f 293 / 447 286 / 432 294 / 449 <nl> + f 298 / 456 297 / 455 201 / 313 296 / 454 <nl> + f 299 / 457 297 / 455 298 / 456 300 / 458 <nl> + f 301 / 460 299 / 457 300 / 458 302 / 463 <nl> + f 201 / 312 301 / 459 302 / 462 296 / 453 <nl> + f 296 / 452 302 / 461 300 / 458 298 / 456 <nl> + f 232 / 351 332 / 516 333 / 517 234 / 355 <nl> + f 307 / 473 334 / 518 335 / 520 430 / 661 <nl> + f 430 / 660 335 / 519 332 / 515 232 / 350 <nl> + f 304 / 469 310 / 479 308 / 474 306 / 472 <nl> + f 136 / 205 311 / 480 126 / 186 137 / 208 <nl> + f 437 / 671 312 / 482 125 / 184 436 / 670 <nl> + f 134 / 200 312 / 482 132 / 197 133 / 198 <nl> + f 321 / 497 320 / 496 163 / 251 165 / 254 <nl> + f 322 / 498 321 / 497 165 / 254 164 / 253 <nl> + f 323 / 499 322 / 498 164 / 253 167 / 256 <nl> + f 324 / 500 323 / 499 167 / 256 166 / 255 <nl> + f 319 / 495 324 / 500 166 / 255 169 / 259 <nl> + f 449 / 684 448 / 683 140 / 212 147 / 224 <nl> + f 450 / 685 449 / 684 147 / 224 139 / 211 <nl> + f 453 / 691 450 / 685 139 / 211 138 / 210 <nl> + f 330 / 512 453 / 690 138 / 209 148 / 225 <nl> + f 331 / 514 330 / 512 148 / 225 141 / 214 <nl> + f 448 / 683 331 / 513 141 / 213 140 / 212 <nl> + f 332 / 516 304 / 468 306 / 472 333 / 517 <nl> + f 334 / 518 333 / 517 306 / 472 308 / 474 <nl> + f 335 / 520 334 / 518 308 / 474 310 / 478 <nl> + f 332 / 515 335 / 519 310 / 477 304 / 467 <nl> + f 209 / 327 461 / 701 460 / 700 210 / 328 <nl> + f 206 / 323 338 / 525 339 / 526 205 / 321 <nl> + f 205 / 321 339 / 526 461 / 701 209 / 327 <nl> + f 204 / 319 89 / 139 87 / 137 207 / 325 <nl> + f 210 / 328 460 / 700 89 / 139 204 / 319 <nl> + f 209 / 327 210 / 328 342 / 531 <nl> + f 210 / 328 204 / 318 207 / 324 342 / 531 <nl> + f 352 / 545 354 / 547 353 / 546 351 / 544 <nl> + f 364 / 557 363 / 556 354 / 547 352 / 545 <nl> + f 357 / 550 365 / 558 364 / 557 352 / 545 <nl> + f 359 / 552 352 / 545 351 / 544 360 / 553 <nl> + f 343 / 532 351 / 544 353 / 546 344 / 534 <nl> + f 344 / 533 353 / 546 354 / 547 377 / 576 <nl> + f 377 / 575 354 / 547 363 / 556 362 / 555 <nl> + f 379 / 580 356 / 549 355 / 548 346 / 537 <nl> + f 346 / 537 355 / 548 358 / 551 348 / 539 <nl> + f 349 / 541 359 / 552 360 / 553 350 / 543 <nl> + f 350 / 542 360 / 553 351 / 544 343 / 532 <nl> + f 357 / 550 361 / 554 366 / 559 365 / 558 <nl> + f 359 / 552 349 / 540 361 / 554 357 / 550 <nl> + f 362 / 555 363 / 556 356 / 549 379 / 579 <nl> + f 355 / 548 356 / 549 363 / 556 364 / 557 <nl> + f 365 / 558 358 / 551 355 / 548 364 / 557 <nl> + f 375 / 572 377 / 574 376 / 573 374 / 571 <nl> + f 378 / 577 379 / 578 377 / 574 375 / 572 <nl> + f 380 / 581 123 / 182 378 / 577 375 / 572 <nl> + f 380 / 581 375 / 572 374 / 571 124 / 183 <nl> + f 367 / 561 374 / 571 376 / 573 394 / 604 <nl> + f 394 / 603 376 / 573 377 / 574 389 / 593 <nl> + f 389 / 593 377 / 574 379 / 578 371 / 568 <nl> + f 371 / 568 379 / 578 378 / 577 370 / 565 <nl> + f 370 / 565 378 / 577 123 / 182 319 / 494 <nl> + f 313 / 484 124 / 183 374 / 571 367 / 561 <nl> + f 436 / 669 314 / 485 384 / 586 383 / 584 <nl> + f 314 / 485 313 / 483 367 / 560 384 / 586 <nl> + f 319 / 493 318 / 492 386 / 588 370 / 564 <nl> + f 438 / 672 437 / 671 433 / 666 390 / 594 <nl> + f 394 / 602 389 / 592 391 / 595 392 / 597 <nl> + f 383 / 585 393 / 601 392 / 598 433 / 666 <nl> + f 386 / 588 387 / 590 371 / 567 370 / 564 <nl> + f 384 / 586 395 / 605 393 / 600 383 / 584 <nl> + f 318 / 492 438 / 672 390 / 594 386 / 588 <nl> + f 391 / 596 387 / 590 386 / 588 390 / 594 <nl> + f 389 / 592 371 / 566 387 / 589 391 / 595 <nl> + f 393 / 599 395 / 605 394 / 602 392 / 597 <nl> + f 401 / 617 407 / 623 404 / 620 403 / 619 <nl> + f 396 / 607 406 / 622 407 / 624 401 / 616 <nl> + f 399 / 611 398 / 609 402 / 618 400 / 614 <nl> + f 405 / 621 397 / 608 403 / 619 404 / 620 <nl> + f 397 / 608 396 / 606 401 / 615 403 / 619 <nl> + f 398 / 609 405 / 621 404 / 620 402 / 618 <nl> + f 407 / 624 406 / 622 399 / 610 400 / 613 <nl> + f 404 / 620 407 / 623 400 / 612 402 / 618 <nl> + f 408 / 627 410 / 631 411 / 632 409 / 630 <nl> + f 410 / 631 412 / 633 413 / 634 411 / 632 <nl> + f 416 / 639 419 / 646 418 / 643 417 / 640 <nl> + f 414 / 636 408 / 626 409 / 629 415 / 637 <nl> + f 409 / 628 411 / 632 413 / 634 415 / 638 <nl> + f 414 / 635 412 / 633 410 / 631 408 / 625 <nl> + f 412 / 633 416 / 639 417 / 640 413 / 634 <nl> + f 413 / 634 417 / 640 418 / 642 415 / 638 <nl> + f 415 / 637 418 / 641 419 / 645 414 / 636 <nl> + f 414 / 635 419 / 644 416 / 639 412 / 633 <nl> + f 422 / 650 425 / 653 426 / 655 420 / 647 <nl> + f 421 / 648 423 / 651 422 / 650 420 / 647 <nl> + f 424 / 652 427 / 656 426 / 654 425 / 653 <nl> + f 329 / 511 309 / 476 315 / 487 336 / 522 <nl> + f 336 / 522 315 / 487 316 / 489 337 / 524 <nl> + f 337 / 524 316 / 489 317 / 491 340 / 528 <nl> + f 340 / 528 317 / 491 325 / 502 341 / 530 <nl> + f 341 / 530 325 / 502 326 / 504 345 / 536 <nl> + f 345 / 536 326 / 504 303 / 465 327 / 506 <nl> + f 347 / 538 368 / 562 369 / 563 <nl> + f 369 / 563 368 / 562 372 / 569 <nl> + f 372 / 569 368 / 562 373 / 570 <nl> + f 373 / 570 368 / 562 381 / 582 <nl> + f 381 / 582 368 / 562 382 / 583 <nl> + f 382 / 583 368 / 562 385 / 587 <nl> + f 385 / 587 368 / 562 388 / 591 <nl> + f 347 / 538 388 / 591 368 / 562 <nl> + f 441 / 675 440 / 674 442 / 676 <nl> + f 441 / 675 442 / 676 443 / 677 <nl> + f 441 / 675 443 / 677 444 / 678 <nl> + f 441 / 675 444 / 678 446 / 681 <nl> + f 441 / 675 446 / 681 447 / 682 <nl> + f 441 / 675 447 / 682 454 / 692 <nl> + f 441 / 675 454 / 692 455 / 693 <nl> + f 441 / 675 455 / 693 440 / 674 <nl> + f 347 / 538 303 / 464 326 / 503 388 / 591 <nl> + f 347 / 538 369 / 563 305 / 470 303 / 464 <nl> + f 369 / 563 372 / 569 309 / 475 305 / 470 <nl> + f 372 / 569 373 / 570 315 / 486 309 / 475 <nl> + f 373 / 570 381 / 582 316 / 488 315 / 486 <nl> + f 381 / 582 382 / 583 317 / 490 316 / 488 <nl> + f 382 / 583 385 / 587 325 / 501 317 / 490 <nl> + f 385 / 587 388 / 591 326 / 503 325 / 501 <nl> + f 203 / 317 327 / 505 328 / 508 228 / 344 <nl> + f 228 / 344 328 / 508 329 / 510 230 / 346 <nl> + f 41 / 79 43 / 83 44 / 84 42 / 82 <nl> + f 43 / 83 45 / 85 46 / 86 44 / 84 <nl> + f 45 / 85 47 / 88 48 / 91 46 / 86 <nl> + f 47 / 87 41 / 78 42 / 81 48 / 90 <nl> + f 42 / 80 44 / 84 46 / 86 48 / 89 <nl> + f 230 / 346 329 / 510 336 / 521 428 / 658 <nl> + f 428 / 658 336 / 521 337 / 523 432 / 665 <nl> + f 432 / 665 337 / 523 340 / 527 434 / 667 <nl> + f 434 / 667 340 / 527 341 / 529 435 / 668 <nl> + f 435 / 668 341 / 529 345 / 535 439 / 673 <nl> + f 439 / 673 345 / 535 327 / 505 203 / 317 <nl> + f 440 / 674 203 / 317 228 / 344 442 / 676 <nl> + f 442 / 676 228 / 344 230 / 346 443 / 677 <nl> + f 443 / 677 230 / 346 428 / 658 444 / 678 <nl> + f 444 / 678 428 / 658 432 / 665 446 / 681 <nl> + f 446 / 681 432 / 665 434 / 667 447 / 682 <nl> + f 447 / 682 434 / 667 435 / 668 454 / 692 <nl> + f 454 / 692 435 / 668 439 / 673 455 / 693 <nl> + f 440 / 674 455 / 693 439 / 673 203 / 317 <nl> + f 94 / 146 101 / 153 102 / 154 93 / 145 <nl> + f 357 / 550 352 / 545 359 / 552 <nl> + f 57 / 92 65 / 102 66 / 105 58 / 94 <nl> + f 58 / 93 66 / 104 67 / 107 59 / 95 <nl> + f 59 / 95 67 / 107 68 / 109 60 / 96 <nl> + f 60 / 96 68 / 109 69 / 111 61 / 97 <nl> + f 61 / 97 69 / 111 70 / 113 62 / 98 <nl> + f 62 / 98 70 / 113 71 / 115 63 / 99 <nl> + f 63 / 99 71 / 115 72 / 117 64 / 100 <nl> + f 64 / 100 72 / 117 65 / 102 57 / 92 <nl> + f 65 / 101 73 / 118 66 / 103 <nl> + f 66 / 103 73 / 118 67 / 106 <nl> + f 67 / 106 73 / 118 68 / 108 <nl> + f 68 / 108 73 / 118 69 / 110 <nl> + f 69 / 110 73 / 118 70 / 112 <nl> + f 70 / 112 73 / 118 71 / 114 <nl> + f 71 / 114 73 / 118 72 / 116 <nl> + f 72 / 116 73 / 118 65 / 101 <nl> + f 74 / 119 76 / 123 77 / 124 75 / 121 <nl> + <nl> new file mode 100644 <nl> index 000000000000 . . 7073a9678cf9 <nl> Binary files / dev / null and b / tests / cpp - tests / Resources / Sprite3DTest / boss . png differ <nl> new file mode 100644 <nl> index 000000000000 . . caa608af4b1a <nl> mmm / dev / null <nl> ppp b / tests / cpp - tests / Resources / Sprite3DTest / boss1 . obj <nl> <nl> + # 3ds Max Wavefront OBJ Exporter v0 . 97b - ( c ) 2007 guruware <nl> + # File Created : 15 . 05 . 2014 08 : 13 : 14 <nl> + <nl> + mtllib boo1 . mtl <nl> + <nl> + # <nl> + # object Object <nl> + # <nl> + <nl> + v 0 . 5491 - 0 . 2313 7 . 4010 <nl> + v 0 . 5491 - 0 . 3996 7 . 0495 <nl> + v 0 . 5491 - 0 . 3669 7 . 0495 <nl> + v 0 . 5491 - 0 . 0174 7 . 0495 <nl> + v 0 . 5491 0 . 0042 7 . 2281 <nl> + v - 0 . 5491 - 0 . 3669 7 . 0495 <nl> + v - 0 . 5491 - 0 . 3996 7 . 0495 <nl> + v - 0 . 5491 - 0 . 2313 7 . 4010 <nl> + v - 0 . 5491 - 0 . 0174 7 . 0495 <nl> + v - 0 . 5491 0 . 0042 7 . 2281 <nl> + v 2 . 0189 1 . 1850 - 2 . 6543 <nl> + v 2 . 0189 1 . 1850 - 0 . 0764 <nl> + v 2 . 1527 1 . 1295 - 0 . 0764 <nl> + v 2 . 1527 1 . 1295 - 2 . 6543 <nl> + v 1 . 8851 1 . 1295 - 2 . 6543 <nl> + v 1 . 8851 1 . 1295 - 0 . 0764 <nl> + v 1 . 8296 0 . 9957 - 2 . 6543 <nl> + v 1 . 8296 0 . 9957 - 0 . 0764 <nl> + v 1 . 8851 0 . 8619 - 2 . 6543 <nl> + v 1 . 8851 0 . 8619 - 0 . 0764 <nl> + v 2 . 0189 0 . 8064 - 2 . 6543 <nl> + v 2 . 0189 0 . 8064 - 0 . 0764 <nl> + v 2 . 1527 0 . 8619 - 2 . 6543 <nl> + v 2 . 1527 0 . 8619 - 0 . 0764 <nl> + v 2 . 2082 0 . 9957 - 2 . 6543 <nl> + v 2 . 2082 0 . 9957 - 0 . 0764 <nl> + v 2 . 0189 0 . 9957 0 . 0760 <nl> + v 2 . 0189 0 . 9959 - 2 . 7785 <nl> + v - 2 . 1527 1 . 1295 - 0 . 0764 <nl> + v - 2 . 0189 1 . 1850 - 0 . 0764 <nl> + v - 2 . 0189 1 . 1850 - 2 . 6543 <nl> + v - 2 . 1527 1 . 1295 - 2 . 6543 <nl> + v - 1 . 8851 1 . 1295 - 0 . 0764 <nl> + v - 1 . 8851 1 . 1295 - 2 . 6543 <nl> + v - 1 . 8296 0 . 9957 - 0 . 0764 <nl> + v - 1 . 8296 0 . 9957 - 2 . 6543 <nl> + v - 1 . 8851 0 . 8619 - 0 . 0764 <nl> + v - 1 . 8851 0 . 8619 - 2 . 6543 <nl> + v - 2 . 0189 0 . 8064 - 0 . 0764 <nl> + v - 2 . 0189 0 . 8064 - 2 . 6543 <nl> + v - 2 . 1527 0 . 8619 - 0 . 0764 <nl> + v - 2 . 1527 0 . 8619 - 2 . 6543 <nl> + v - 2 . 2082 0 . 9957 - 0 . 0764 <nl> + v - 2 . 2082 0 . 9957 - 2 . 6543 <nl> + v - 2 . 0189 0 . 9957 0 . 0760 <nl> + v - 2 . 0189 0 . 9959 - 2 . 7785 <nl> + v 0 . 0000 0 . 0042 7 . 2281 <nl> + v 0 . 0000 - 0 . 0174 7 . 0495 <nl> + v 0 . 0000 - 0 . 2313 7 . 4010 <nl> + v - 0 . 5491 - 0 . 8803 7 . 0495 <nl> + v 0 . 0000 - 0 . 8803 7 . 0495 <nl> + v 0 . 0000 - 0 . 8660 7 . 2281 <nl> + v - 0 . 5491 - 0 . 8660 7 . 2281 <nl> + v 0 . 0000 - 0 . 5900 7 . 4284 <nl> + v - 0 . 5491 - 0 . 5900 7 . 4284 <nl> + v 0 . 8460 1 . 7558 - 3 . 7140 <nl> + v 1 . 2699 2 . 8555 - 3 . 5520 <nl> + v 1 . 1699 2 . 8947 - 3 . 5020 <nl> + v 0 . 6201 1 . 8444 - 3 . 6010 <nl> + v 1 . 2321 2 . 8937 - 3 . 6576 <nl> + v 1 . 1320 2 . 9329 - 3 . 6076 <nl> + v 0 . 7606 1 . 8420 - 3 . 9526 <nl> + v 0 . 5346 1 . 9306 - 3 . 8396 <nl> + v 1 . 2146 2 . 0382 - 4 . 8054 <nl> + v 0 . 4218 2 . 4154 - 4 . 7624 <nl> + v 0 . 4738 2 . 5225 - 4 . 7423 <nl> + v 1 . 2666 2 . 1453 - 4 . 7853 <nl> + v - 0 . 1562 2 . 5757 - 4 . 1199 <nl> + v - 0 . 1042 2 . 6828 - 4 . 0998 <nl> + v - 2 . 2991 1 . 9669 - 5 . 1457 <nl> + v - 2 . 2991 1 . 9669 - 5 . 7781 <nl> + v - 2 . 2991 1 . 3344 - 5 . 7781 <nl> + v - 2 . 2991 1 . 3344 - 5 . 1457 <nl> + v - 1 . 6667 1 . 9669 - 5 . 7781 <nl> + v - 1 . 6667 1 . 9669 - 5 . 1457 <nl> + v - 1 . 6667 1 . 3344 - 5 . 1457 <nl> + v - 1 . 6667 1 . 3344 - 5 . 7781 <nl> + v - 2 . 0362 1 . 6380 - 4 . 1779 <nl> + v - 1 . 9639 1 . 6680 - 4 . 1779 <nl> + v - 1 . 9639 1 . 6680 - 5 . 2168 <nl> + v - 2 . 0362 1 . 6380 - 5 . 2168 <nl> + v - 1 . 8916 1 . 6380 - 4 . 1779 <nl> + v - 1 . 8916 1 . 6380 - 5 . 2168 <nl> + v - 1 . 8616 1 . 5657 - 4 . 1779 <nl> + v - 1 . 8616 1 . 5657 - 5 . 2167 <nl> + v - 1 . 8916 1 . 4934 - 4 . 1779 <nl> + v - 1 . 8916 1 . 4934 - 5 . 2168 <nl> + v - 1 . 9639 1 . 4634 - 4 . 1779 <nl> + v - 1 . 9639 1 . 4634 - 5 . 2168 <nl> + v - 2 . 0362 1 . 4934 - 4 . 1779 <nl> + v - 2 . 0362 1 . 4934 - 5 . 2168 <nl> + v - 2 . 0661 1 . 5657 - 4 . 1779 <nl> + v - 2 . 0661 1 . 5657 - 5 . 2167 <nl> + v - 1 . 9639 1 . 5657 - 4 . 1779 <nl> + v 1 . 8132 0 . 8821 0 . 7520 <nl> + v 1 . 7356 0 . 7716 2 . 3721 <nl> + v 2 . 2768 0 . 7199 2 . 3598 <nl> + v 3 . 0073 0 . 6756 0 . 7519 <nl> + v 3 . 0077 0 . 6756 - 0 . 7386 <nl> + v 1 . 8134 0 . 8820 - 0 . 7386 <nl> + v 0 . 5255 0 . 8822 - 0 . 7386 <nl> + v 0 . 5255 0 . 8822 0 . 7520 <nl> + v 0 . 5255 0 . 8270 1 . 8401 <nl> + v 1 . 7356 0 . 6499 2 . 3721 <nl> + v 2 . 2768 0 . 5982 2 . 3598 <nl> + v 3 . 0073 0 . 5540 0 . 7519 <nl> + v 3 . 0077 0 . 5540 - 0 . 7386 <nl> + v 1 . 8136 0 . 7603 - 4 . 0762 <nl> + v 1 . 8136 0 . 8820 - 4 . 0762 <nl> + v 3 . 0082 0 . 6756 - 4 . 0762 <nl> + v 3 . 0082 0 . 5540 - 4 . 0762 <nl> + v 0 . 5255 0 . 7598 - 4 . 0762 <nl> + v 0 . 5255 0 . 8823 - 4 . 0762 <nl> + v 0 . 5250 0 . 7046 1 . 8372 <nl> + v 1 . 0438 0 . 6500 2 . 3721 <nl> + v 1 . 0438 0 . 7717 2 . 3721 <nl> + v 0 . 5252 0 . 7594 - 0 . 7400 <nl> + v 0 . 5250 0 . 7590 0 . 7492 <nl> + v 1 . 3150 0 . 7605 0 . 7520 <nl> + v 1 . 0365 0 . 4285 5 . 7513 <nl> + v 1 . 8365 0 . 3768 5 . 8643 <nl> + v 1 . 3154 0 . 7603 - 4 . 0762 <nl> + v 0 . 0000 0 . 7606 - 4 . 0762 <nl> + v 0 . 0000 0 . 7606 0 . 7520 <nl> + v 0 . 0000 0 . 4288 5 . 7514 <nl> + v 1 . 8276 0 . 2889 5 . 8586 <nl> + v 1 . 0321 0 . 3404 5 . 7455 <nl> + v 2 . 9975 0 . 4660 0 . 7491 <nl> + v 2 . 9975 0 . 4660 - 4 . 0762 <nl> + v 1 . 3100 0 . 6721 - 4 . 0762 <nl> + v 0 . 0000 0 . 6721 - 4 . 0762 <nl> + v 0 . 0000 0 . 3404 5 . 7455 <nl> + v 0 . 9817 - 0 . 8791 7 . 0621 <nl> + v 0 . 9817 0 . 0087 7 . 0621 <nl> + v 0 . 0000 0 . 0087 7 . 0621 <nl> + v 0 . 0000 - 0 . 8791 7 . 0621 <nl> + v 1 . 3100 - 1 . 3100 - 4 . 0762 <nl> + v 0 . 0000 - 1 . 3100 - 4 . 0762 <nl> + v 0 . 0000 - 1 . 3100 0 . 7491 <nl> + v 1 . 3100 - 1 . 3100 0 . 7491 <nl> + v 0 . 9641 - 1 . 0946 6 . 5511 <nl> + v 0 . 0000 - 1 . 0946 6 . 5511 <nl> + v 1 . 8274 - 0 . 7162 6 . 5010 <nl> + v 2 . 9975 - 0 . 9908 0 . 7491 <nl> + v 1 . 2588 - 0 . 7709 7 . 0621 <nl> + v 2 . 9975 - 0 . 9908 - 4 . 0762 <nl> + v 1 . 2542 - 0 . 0198 7 . 0621 <nl> + v 2 . 1329 0 . 6649 - 8 . 4335 <nl> + v 2 . 9975 0 . 9908 - 6 . 8074 <nl> + v 2 . 9975 - 0 . 9908 - 6 . 8074 <nl> + v 2 . 1329 - 0 . 6649 - 8 . 4335 <nl> + v 1 . 3100 - 1 . 3100 - 6 . 8074 <nl> + v 0 . 9817 - 0 . 8791 - 8 . 4335 <nl> + v 2 . 9975 - 0 . 9908 - 4 . 6052 <nl> + v 2 . 9975 0 . 9908 - 4 . 6052 <nl> + v 1 . 3100 1 . 3100 - 4 . 6052 <nl> + v 1 . 3100 - 1 . 3100 - 4 . 6052 <nl> + v 1 . 3100 1 . 3100 - 6 . 8074 <nl> + v 0 . 9817 0 . 8791 - 8 . 4335 <nl> + v 3 . 9351 - 0 . 4210 - 4 . 6474 <nl> + v 3 . 9351 0 . 4210 - 4 . 6474 <nl> + v 3 . 0905 0 . 4210 - 4 . 6474 <nl> + v 3 . 0905 - 0 . 4210 - 4 . 6474 <nl> + v 3 . 9351 0 . 4210 - 7 . 4454 <nl> + v 3 . 0905 0 . 4210 - 7 . 4454 <nl> + v 3 . 6205 0 . 4210 - 8 . 5728 <nl> + v 3 . 6205 - 0 . 4210 - 8 . 5728 <nl> + v 3 . 0905 - 0 . 4210 - 8 . 5728 <nl> + v 3 . 0905 0 . 4210 - 8 . 5728 <nl> + v 3 . 9351 - 0 . 4210 - 7 . 4454 <nl> + v 3 . 0905 - 0 . 4210 - 7 . 4454 <nl> + v 1 . 3100 0 . 6703 - 2 . 1110 <nl> + v 1 . 3100 0 . 6703 - 3 . 4212 <nl> + v 1 . 3100 1 . 5173 - 3 . 4212 <nl> + v 1 . 3100 1 . 5173 - 2 . 1110 <nl> + v 0 . 6551 1 . 1067 - 0 . 7507 <nl> + v 0 . 6551 0 . 6703 - 0 . 7507 <nl> + v 0 . 6551 0 . 6703 - 4 . 0693 <nl> + v 0 . 6551 1 . 5173 - 4 . 0693 <nl> + v - 2 . 0362 1 . 8778 - 4 . 1779 <nl> + v - 1 . 9639 1 . 9077 - 4 . 1779 <nl> + v - 1 . 9639 1 . 9077 - 5 . 2168 <nl> + v - 2 . 0362 1 . 8778 - 5 . 2168 <nl> + v - 1 . 8916 1 . 8778 - 4 . 1779 <nl> + v - 1 . 8916 1 . 8778 - 5 . 2168 <nl> + v - 1 . 8616 1 . 8055 - 4 . 1779 <nl> + v - 1 . 8616 1 . 8055 - 5 . 2167 <nl> + v - 1 . 8916 1 . 7332 - 4 . 1779 <nl> + v - 1 . 8916 1 . 7332 - 5 . 2168 <nl> + v - 1 . 9639 1 . 7032 - 4 . 1779 <nl> + v - 1 . 9639 1 . 7032 - 5 . 2168 <nl> + v - 2 . 0362 1 . 7332 - 4 . 1779 <nl> + v - 2 . 0362 1 . 7332 - 5 . 2168 <nl> + v - 2 . 0661 1 . 8055 - 4 . 1779 <nl> + v - 2 . 0661 1 . 8055 - 5 . 2167 <nl> + v - 1 . 9639 1 . 8055 - 4 . 1779 <nl> + v - 7 . 6091 - 1 . 0690 0 . 5512 <nl> + v 0 . 0000 - 1 . 4598 - 3 . 9561 <nl> + v 0 . 0000 - 0 . 7653 - 3 . 9561 <nl> + v - 7 . 6091 - 0 . 7653 0 . 5512 <nl> + v - 7 . 6091 - 0 . 7653 - 0 . 6495 <nl> + v 0 . 0000 - 0 . 7653 - 7 . 7329 <nl> + v - 7 . 6091 - 1 . 0690 - 0 . 6495 <nl> + v 0 . 0000 - 1 . 4598 - 7 . 7329 <nl> + v 0 . 0000 - 0 . 7653 6 . 0720 <nl> + v - 1 . 5430 - 0 . 7653 4 . 4940 <nl> + v - 1 . 5430 - 1 . 3426 4 . 4940 <nl> + v 0 . 0000 - 1 . 4598 6 . 0720 <nl> + v 0 . 0000 - 0 . 7653 0 . 4394 <nl> + v 0 . 0000 - 1 . 4598 0 . 4394 <nl> + v - 1 . 5430 - 1 . 3426 0 . 1910 <nl> + v - 1 . 5430 - 0 . 7653 0 . 1910 <nl> + v - 5 . 1435 - 0 . 7653 0 . 8122 <nl> + v - 5 . 1435 - 0 . 7653 - 0 . 3885 <nl> + v - 5 . 1435 - 1 . 0690 - 0 . 3885 <nl> + v - 5 . 1435 - 1 . 0690 0 . 8122 <nl> + v - 1 . 2542 - 0 . 0198 7 . 0621 <nl> + v - 0 . 9817 0 . 0087 7 . 0621 <nl> + v - 1 . 0321 0 . 3404 5 . 7455 <nl> + v - 1 . 8276 0 . 2889 5 . 8586 <nl> + v - 0 . 9817 - 0 . 8791 7 . 0621 <nl> + v - 0 . 9641 - 1 . 0946 6 . 5511 <nl> + v - 1 . 8274 - 0 . 7162 6 . 5010 <nl> + v - 2 . 9975 - 0 . 9908 0 . 7491 <nl> + v - 1 . 3100 - 1 . 3100 0 . 7491 <nl> + v - 0 . 6551 1 . 1067 - 0 . 7507 <nl> + v - 0 . 6551 0 . 6703 - 0 . 7507 <nl> + v 0 . 0000 0 . 6703 - 0 . 7507 <nl> + v 0 . 0000 1 . 1067 - 0 . 7507 <nl> + v 4 . 2086 - 0 . 7408 - 0 . 8965 <nl> + v 4 . 2086 0 . 1580 - 0 . 8965 <nl> + v 2 . 2211 0 . 1580 - 0 . 2044 <nl> + v 2 . 2211 - 0 . 7408 - 0 . 2044 <nl> + v 4 . 2086 0 . 1580 - 3 . 5166 <nl> + v 2 . 2211 0 . 1580 - 3 . 9812 <nl> + v 4 . 2086 - 0 . 7408 - 3 . 5166 <nl> + v 2 . 2211 - 0 . 7408 - 3 . 9812 <nl> + v 0 . 0000 1 . 5173 - 2 . 1110 <nl> + v - 1 . 3100 1 . 5173 - 2 . 1110 <nl> + v - 1 . 3100 1 . 5173 - 3 . 4212 <nl> + v 0 . 0000 1 . 5173 - 3 . 4212 <nl> + v - 0 . 6551 1 . 5173 - 4 . 0693 <nl> + v 0 . 0000 1 . 5173 - 4 . 0693 <nl> + v - 0 . 6551 0 . 6703 - 4 . 0693 <nl> + v - 1 . 3100 1 . 3100 - 6 . 8074 <nl> + v - 1 . 3100 1 . 3100 - 4 . 6052 <nl> + v 0 . 0000 1 . 3100 - 4 . 6052 <nl> + v 0 . 0000 1 . 3100 - 6 . 8074 <nl> + v - 0 . 9817 0 . 8791 - 8 . 4335 <nl> + v 0 . 0000 0 . 8791 - 8 . 4335 <nl> + v - 0 . 9817 - 0 . 8791 - 8 . 4335 <nl> + v 0 . 0000 - 0 . 8791 - 8 . 4335 <nl> + v 0 . 0000 - 1 . 3100 - 6 . 8074 <nl> + v - 1 . 3100 - 1 . 3100 - 6 . 8074 <nl> + v - 1 . 3100 - 1 . 3100 - 4 . 6052 <nl> + v 0 . 0000 - 1 . 3100 - 4 . 6052 <nl> + v 1 . 9657 0 . 7591 - 6 . 3725 <nl> + v 1 . 9657 1 . 4084 - 6 . 3725 <nl> + v 2 . 5383 1 . 4084 - 6 . 1354 <nl> + v 2 . 5383 0 . 7591 - 6 . 1354 <nl> + v 1 . 3932 0 . 7591 - 6 . 1354 <nl> + v 1 . 3932 1 . 4084 - 6 . 1354 <nl> + v 1 . 1560 0 . 7591 - 5 . 5628 <nl> + v 1 . 1560 1 . 4084 - 5 . 5628 <nl> + v 1 . 3932 0 . 7591 - 4 . 9903 <nl> + v 1 . 3932 1 . 4084 - 4 . 9903 <nl> + v 1 . 9657 0 . 7591 - 4 . 7531 <nl> + v 1 . 9657 1 . 4084 - 4 . 7531 <nl> + v 2 . 5383 0 . 7591 - 4 . 9903 <nl> + v 2 . 5383 1 . 4084 - 4 . 9903 <nl> + v 2 . 7755 0 . 7591 - 5 . 5628 <nl> + v 2 . 7755 1 . 4084 - 5 . 5628 <nl> + v 1 . 9657 1 . 4084 - 5 . 5628 <nl> + v 2 . 2991 1 . 3344 - 5 . 1457 <nl> + v 2 . 2991 1 . 9669 - 5 . 1457 <nl> + v 1 . 6667 1 . 9669 - 5 . 1457 <nl> + v 1 . 6667 1 . 3344 - 5 . 1457 <nl> + v 2 . 2991 1 . 9669 - 5 . 7781 <nl> + v 1 . 6667 1 . 9669 - 5 . 7781 <nl> + v 2 . 2991 1 . 3344 - 5 . 7781 <nl> + v 1 . 6667 1 . 3344 - 5 . 7781 <nl> + v 1 . 9639 1 . 6680 - 5 . 2168 <nl> + v 1 . 9639 1 . 6680 - 4 . 1779 <nl> + v 2 . 0362 1 . 6380 - 4 . 1779 <nl> + v 2 . 0362 1 . 6380 - 5 . 2168 <nl> + v 1 . 8916 1 . 6380 - 5 . 2168 <nl> + v 1 . 8916 1 . 6380 - 4 . 1779 <nl> + v 1 . 8616 1 . 5657 - 5 . 2167 <nl> + v 1 . 8616 1 . 5657 - 4 . 1779 <nl> + v 1 . 8916 1 . 4934 - 5 . 2168 <nl> + v 1 . 8916 1 . 4934 - 4 . 1779 <nl> + v 1 . 9639 1 . 4634 - 5 . 2168 <nl> + v 1 . 9639 1 . 4634 - 4 . 1779 <nl> + v 2 . 0362 1 . 4934 - 5 . 2168 <nl> + v 2 . 0362 1 . 4934 - 4 . 1779 <nl> + v 2 . 0661 1 . 5657 - 5 . 2167 <nl> + v 2 . 0661 1 . 5657 - 4 . 1779 <nl> + v 1 . 9639 1 . 5657 - 4 . 1779 <nl> + v 1 . 9639 1 . 9077 - 5 . 2168 <nl> + v 1 . 9639 1 . 9077 - 4 . 1779 <nl> + v 2 . 0362 1 . 8778 - 4 . 1779 <nl> + v 2 . 0362 1 . 8778 - 5 . 2168 <nl> + v 1 . 8916 1 . 8778 - 5 . 2168 <nl> + v 1 . 8916 1 . 8778 - 4 . 1779 <nl> + v 1 . 8616 1 . 8055 - 5 . 2167 <nl> + v 1 . 8616 1 . 8055 - 4 . 1779 <nl> + v 1 . 8916 1 . 7332 - 5 . 2168 <nl> + v 1 . 8916 1 . 7332 - 4 . 1779 <nl> + v 1 . 9639 1 . 7032 - 5 . 2168 <nl> + v 1 . 9639 1 . 7032 - 4 . 1779 <nl> + v 2 . 0362 1 . 7332 - 5 . 2168 <nl> + v 2 . 0362 1 . 7332 - 4 . 1779 <nl> + v 2 . 0661 1 . 8055 - 5 . 2167 <nl> + v 2 . 0661 1 . 8055 - 4 . 1779 <nl> + v 1 . 9639 1 . 8055 - 4 . 1779 <nl> + v 7 . 6091 - 1 . 0690 0 . 5512 <nl> + v 7 . 6091 - 0 . 7653 0 . 5512 <nl> + v 7 . 6091 - 0 . 7653 - 0 . 6495 <nl> + v 7 . 6091 - 1 . 0690 - 0 . 6495 <nl> + v 1 . 5430 - 1 . 3426 4 . 4940 <nl> + v 1 . 5430 - 0 . 7653 4 . 4940 <nl> + v 1 . 5430 - 0 . 7653 0 . 1910 <nl> + v 1 . 5430 - 1 . 3426 0 . 1910 <nl> + v 5 . 1435 - 1 . 0690 - 0 . 3885 <nl> + v 5 . 1435 - 0 . 7653 - 0 . 3885 <nl> + v 5 . 1435 - 0 . 7653 0 . 8122 <nl> + v 5 . 1435 - 1 . 0690 0 . 8122 <nl> + v 0 . 5491 - 0 . 5900 7 . 4284 <nl> + v 0 . 5491 - 0 . 8803 7 . 0495 <nl> + v 0 . 5491 - 0 . 8660 7 . 2281 <nl> + v - 1 . 8132 0 . 8821 0 . 7520 <nl> + v - 3 . 0073 0 . 6756 0 . 7519 <nl> + v - 2 . 2768 0 . 7199 2 . 3598 <nl> + v - 1 . 7356 0 . 7716 2 . 3721 <nl> + v - 3 . 0077 0 . 6756 - 0 . 7386 <nl> + v - 1 . 8134 0 . 8820 - 0 . 7386 <nl> + v - 0 . 5255 0 . 8822 - 0 . 7386 <nl> + v - 0 . 5255 0 . 8822 0 . 7520 <nl> + v - 0 . 5255 0 . 8270 1 . 8401 <nl> + v - 1 . 0438 0 . 7717 2 . 3721 <nl> + v - 1 . 7356 0 . 6499 2 . 3721 <nl> + v - 2 . 2768 0 . 5982 2 . 3598 <nl> + v - 3 . 0073 0 . 5540 0 . 7519 <nl> + v - 3 . 0077 0 . 5540 - 0 . 7386 <nl> + v - 3 . 0082 0 . 6756 - 4 . 0762 <nl> + v - 1 . 8136 0 . 8820 - 4 . 0762 <nl> + v - 1 . 8136 0 . 7603 - 4 . 0762 <nl> + v - 3 . 0082 0 . 5540 - 4 . 0762 <nl> + v - 0 . 5255 0 . 8823 - 4 . 0762 <nl> + v - 0 . 5255 0 . 7598 - 4 . 0762 <nl> + v - 0 . 5250 0 . 7046 1 . 8372 <nl> + v - 1 . 0438 0 . 6500 2 . 3721 <nl> + v - 0 . 5250 0 . 7590 0 . 7492 <nl> + v - 0 . 5252 0 . 7594 - 0 . 7400 <nl> + v - 1 . 3150 0 . 7605 0 . 7520 <nl> + v - 1 . 8365 0 . 3768 5 . 8643 <nl> + v - 1 . 0365 0 . 4285 5 . 7513 <nl> + v - 1 . 3154 0 . 7603 - 4 . 0762 <nl> + v - 2 . 9975 0 . 4660 0 . 7491 <nl> + v - 2 . 9975 0 . 4660 - 4 . 0762 <nl> + v - 1 . 3100 0 . 6721 - 4 . 0762 <nl> + v - 1 . 3100 - 1 . 3100 - 4 . 0762 <nl> + v - 1 . 2588 - 0 . 7709 7 . 0621 <nl> + v - 2 . 9975 - 0 . 9908 - 4 . 0762 <nl> + v - 2 . 9975 - 0 . 9908 - 6 . 8074 <nl> + v - 2 . 9975 0 . 9908 - 6 . 8074 <nl> + v - 2 . 1329 0 . 6649 - 8 . 4335 <nl> + v - 2 . 1329 - 0 . 6649 - 8 . 4335 <nl> + v - 2 . 9975 0 . 9908 - 4 . 6052 <nl> + v - 2 . 9975 - 0 . 9908 - 4 . 6052 <nl> + v - 3 . 0905 0 . 4210 - 4 . 6474 <nl> + v - 3 . 9351 0 . 4210 - 4 . 6474 <nl> + v - 3 . 9351 - 0 . 4210 - 4 . 6474 <nl> + v - 3 . 0905 - 0 . 4210 - 4 . 6474 <nl> + v - 3 . 0905 0 . 4210 - 7 . 4454 <nl> + v - 3 . 9351 0 . 4210 - 7 . 4454 <nl> + v - 3 . 0905 - 0 . 4210 - 8 . 5728 <nl> + v - 3 . 6205 - 0 . 4210 - 8 . 5728 <nl> + v - 3 . 6205 0 . 4210 - 8 . 5728 <nl> + v - 3 . 0905 0 . 4210 - 8 . 5728 <nl> + v - 3 . 9351 - 0 . 4210 - 7 . 4454 <nl> + v - 3 . 0905 - 0 . 4210 - 7 . 4454 <nl> + v - 1 . 3100 0 . 6703 - 3 . 4212 <nl> + v - 1 . 3100 0 . 6703 - 2 . 1110 <nl> + v - 0 . 1808 2 . 4254 - 3 . 2542 <nl> + v - 0 . 1287 2 . 5325 - 3 . 2341 <nl> + v 0 . 3624 2 . 0524 - 2 . 6724 <nl> + v 0 . 4145 2 . 1595 - 2 . 6523 <nl> + v 1 . 1553 1 . 6753 - 2 . 7154 <nl> + v 1 . 2073 1 . 7823 - 2 . 6953 <nl> + v 1 . 7332 1 . 5149 - 3 . 3580 <nl> + v 1 . 7853 1 . 6220 - 3 . 3379 <nl> + v 1 . 7578 1 . 6652 - 4 . 2237 <nl> + v 1 . 8099 1 . 7723 - 4 . 2036 <nl> + v 0 . 9380 1 . 7479 - 4 . 5237 <nl> + v 0 . 5838 1 . 6240 - 3 . 8179 <nl> + v 0 . 3954 2 . 0060 - 4 . 4943 <nl> + v - 0 . 0002 2 . 1158 - 4 . 0545 <nl> + v - 0 . 0171 2 . 0129 - 3 . 4620 <nl> + v 0 . 3547 1 . 7576 - 3 . 0638 <nl> + v 0 . 8974 1 . 4994 - 3 . 0932 <nl> + v 1 . 2930 1 . 3897 - 3 . 5330 <nl> + v 1 . 3098 1 . 4926 - 4 . 1255 <nl> + v 0 . 7030 1 . 8693 - 3 . 7719 <nl> + v 0 . 9801 1 . 9662 - 4 . 3241 <nl> + v 0 . 5556 2 . 1682 - 4 . 3010 <nl> + v 0 . 2461 2 . 2540 - 3 . 9570 <nl> + v 0 . 2329 2 . 1735 - 3 . 4935 <nl> + v 0 . 5238 1 . 9738 - 3 . 1820 <nl> + v 0 . 9483 1 . 7719 - 3 . 2050 <nl> + v 1 . 2578 1 . 6860 - 3 . 5490 <nl> + v 1 . 2710 1 . 7665 - 4 . 0126 <nl> + v 0 . 5227 2 . 4731 - 4 . 6059 <nl> + v 1 . 2098 2 . 1463 - 4 . 6431 <nl> + v 0 . 0218 2 . 6121 - 4 . 0490 <nl> + v - 2 . 2211 0 . 1580 - 0 . 2044 <nl> + v - 4 . 2086 0 . 1580 - 0 . 8965 <nl> + v - 4 . 2086 - 0 . 7408 - 0 . 8965 <nl> + v - 2 . 2211 - 0 . 7408 - 0 . 2044 <nl> + v - 2 . 2211 0 . 1580 - 3 . 9812 <nl> + v - 4 . 2086 0 . 1580 - 3 . 5166 <nl> + v - 2 . 2211 - 0 . 7408 - 3 . 9812 <nl> + v - 4 . 2086 - 0 . 7408 - 3 . 5166 <nl> + v 0 . 0005 2 . 4818 - 3 . 2987 <nl> + v 0 . 4713 2 . 1585 - 2 . 7945 <nl> + v 1 . 1584 1 . 8317 - 2 . 8318 <nl> + v 1 . 6593 1 . 6927 - 3 . 3887 <nl> + v 1 . 6806 1 . 8230 - 4 . 1389 <nl> + v - 2 . 5383 1 . 4084 - 6 . 1354 <nl> + v - 1 . 9657 1 . 4084 - 6 . 3725 <nl> + v - 1 . 9657 0 . 7591 - 6 . 3725 <nl> + v - 2 . 5383 0 . 7591 - 6 . 1354 <nl> + v - 1 . 3932 1 . 4084 - 6 . 1354 <nl> + v - 1 . 3932 0 . 7591 - 6 . 1354 <nl> + v - 1 . 1560 1 . 4084 - 5 . 5628 <nl> + v - 1 . 1560 0 . 7591 - 5 . 5628 <nl> + v - 1 . 3932 1 . 4084 - 4 . 9903 <nl> + v - 1 . 3932 0 . 7591 - 4 . 9903 <nl> + v - 1 . 9657 1 . 4084 - 4 . 7531 <nl> + v - 1 . 9657 0 . 7591 - 4 . 7531 <nl> + v - 2 . 5383 1 . 4084 - 4 . 9903 <nl> + v - 2 . 5383 0 . 7591 - 4 . 9903 <nl> + v - 2 . 7755 1 . 4084 - 5 . 5628 <nl> + v - 2 . 7755 0 . 7591 - 5 . 5628 <nl> + v - 1 . 9657 1 . 4084 - 5 . 5628 <nl> + # 445 vertices <nl> + <nl> + vn 0 . 6502 0 . 2638 0 . 7125 <nl> + vn 1 . 0000 0 . 0000 - 0 . 0000 <nl> + vn 0 . 7327 0 . 6756 - 0 . 0817 <nl> + vn 0 . 6092 0 . 7277 0 . 3152 <nl> + vn - 1 . 0000 0 . 0000 - 0 . 0000 <nl> + vn - 0 . 6502 0 . 2638 0 . 7125 <nl> + vn - 0 . 7327 0 . 6756 - 0 . 0817 <nl> + vn - 0 . 6092 0 . 7277 0 . 3152 <nl> + vn - 0 . 0000 0 . 9018 - 0 . 4322 <nl> + vn - 0 . 0000 0 . 9185 0 . 3953 <nl> + vn 0 . 6495 0 . 6495 0 . 3953 <nl> + vn 0 . 6377 0 . 6376 - 0 . 4323 <nl> + vn - 0 . 6377 0 . 6376 - 0 . 4323 <nl> + vn - 0 . 6495 0 . 6495 0 . 3953 <nl> + vn - 0 . 9017 - 0 . 0001 - 0 . 4324 <nl> + vn - 0 . 9185 - 0 . 0000 0 . 3953 <nl> + vn - 0 . 6375 - 0 . 6376 - 0 . 4326 <nl> + vn - 0 . 6495 - 0 . 6495 0 . 3953 <nl> + vn - 0 . 0000 - 0 . 9016 - 0 . 4326 <nl> + vn - 0 . 0000 - 0 . 9185 0 . 3953 <nl> + vn 0 . 6375 - 0 . 6376 - 0 . 4326 <nl> + vn 0 . 6495 - 0 . 6495 0 . 3953 <nl> + vn 0 . 9017 - 0 . 0001 - 0 . 4324 <nl> + vn 0 . 9185 - 0 . 0000 0 . 3953 <nl> + vn - 0 . 0000 - 0 . 0000 1 . 0000 <nl> + vn - 0 . 0000 0 . 0006 - 1 . 0000 <nl> + vn 0 . 0000 0 . 9185 0 . 3953 <nl> + vn 0 . 0000 0 . 9018 - 0 . 4322 <nl> + vn 0 . 0000 - 0 . 9185 0 . 3953 <nl> + vn 0 . 0000 - 0 . 9016 - 0 . 4326 <nl> + vn 0 . 0000 - 0 . 0000 1 . 0000 <nl> + vn 0 . 0000 0 . 0006 - 1 . 0000 <nl> + vn 0 . 0000 0 . 9176 0 . 3974 <nl> + vn 0 . 0000 0 . 9928 - 0 . 1201 <nl> + vn 0 . 0000 0 . 3472 0 . 9378 <nl> + vn - 0 . 6884 - 0 . 7230 0 . 0579 <nl> + vn 0 . 0000 - 0 . 9968 0 . 0798 <nl> + vn 0 . 0000 - 0 . 8720 0 . 4895 <nl> + vn - 0 . 6240 - 0 . 6814 0 . 3825 <nl> + vn 0 . 0000 - 0 . 2723 0 . 9622 <nl> + vn - 0 . 6371 - 0 . 2099 0 . 7416 <nl> + vn 0 . 8576 - 0 . 3814 0 . 3451 <nl> + vn 0 . 9146 0 . 1754 0 . 3642 <nl> + vn - 0 . 0309 0 . 5461 0 . 8371 <nl> + vn - 0 . 3313 0 . 0848 0 . 9397 <nl> + vn 0 . 5569 0 . 5364 - 0 . 6342 <nl> + vn - 0 . 3887 0 . 9071 - 0 . 1613 <nl> + vn 0 . 4077 0 . 0725 - 0 . 9102 <nl> + vn - 0 . 7811 0 . 5387 - 0 . 3157 <nl> + vn 0 . 1842 - 0 . 3355 - 0 . 9239 <nl> + vn - 0 . 4566 - 0 . 0306 - 0 . 8891 <nl> + vn 0 . 0237 0 . 8092 - 0 . 5871 <nl> + vn 0 . 5596 0 . 5542 - 0 . 6162 <nl> + vn - 0 . 9238 0 . 0990 - 0 . 3697 <nl> + vn - 0 . 3671 0 . 9176 - 0 . 1527 <nl> + vn - 0 . 5774 0 . 5774 0 . 5774 <nl> + vn - 0 . 5774 0 . 5774 - 0 . 5774 <nl> + vn - 0 . 7071 0 . 0000 - 0 . 7071 <nl> + vn - 0 . 7071 0 . 0000 0 . 7071 <nl> + vn 0 . 5774 0 . 5774 - 0 . 5774 <nl> + vn 0 . 5774 0 . 5774 0 . 5774 <nl> + vn 0 . 7071 0 . 0000 0 . 7071 <nl> + vn 0 . 7071 0 . 0000 - 0 . 7071 <nl> + vn - 0 . 5490 0 . 5490 0 . 6303 <nl> + vn 0 . 0000 0 . 7764 0 . 6303 <nl> + vn 0 . 0000 1 . 0000 - 0 . 0000 <nl> + vn - 0 . 7071 0 . 7071 - 0 . 0000 <nl> + vn 0 . 5490 0 . 5490 0 . 6303 <nl> + vn 0 . 7071 0 . 7071 - 0 . 0000 <nl> + vn 0 . 7764 0 . 0000 0 . 6303 <nl> + vn 0 . 5490 - 0 . 5490 0 . 6303 <nl> + vn 0 . 7071 - 0 . 7071 - 0 . 0000 <nl> + vn 0 . 0000 - 0 . 7764 0 . 6303 <nl> + vn 0 . 0000 - 1 . 0000 - 0 . 0000 <nl> + vn - 0 . 5490 - 0 . 5490 0 . 6303 <nl> + vn - 0 . 7071 - 0 . 7071 - 0 . 0000 <nl> + vn - 0 . 7764 0 . 0000 0 . 6303 <nl> + vn 0 . 0000 0 . 0000 1 . 0000 <nl> + vn 0 . 0848 0 . 9960 0 . 0288 <nl> + vn 0 . 0437 0 . 6873 0 . 7251 <nl> + vn 0 . 4732 0 . 5593 0 . 6806 <nl> + vn 0 . 7829 0 . 6009 0 . 1613 <nl> + vn 0 . 7650 0 . 6441 0 . 0002 <nl> + vn 0 . 0856 0 . 9963 - 0 . 0000 <nl> + vn - 0 . 4494 0 . 8934 - 0 . 0001 <nl> + vn - 0 . 7001 0 . 7138 0 . 0181 <nl> + vn - 0 . 7097 0 . 6256 0 . 3239 <nl> + vn 0 . 0117 0 . 0000 0 . 9999 <nl> + vn 0 . 5713 0 . 0000 0 . 8207 <nl> + vn 0 . 9172 0 . 3679 0 . 1530 <nl> + vn 1 . 0000 0 . 0000 0 . 0002 <nl> + vn 0 . 0000 0 . 0000 - 1 . 0000 <nl> + vn 0 . 0621 0 . 7227 - 0 . 6884 <nl> + vn 0 . 6194 0 . 5215 - 0 . 5868 <nl> + vn 0 . 7125 0 . 2937 - 0 . 6373 <nl> + vn 0 . 0002 0 . 7071 - 0 . 7071 <nl> + vn - 0 . 9226 - 0 . 0047 0 . 3857 <nl> + vn - 0 . 3804 0 . 0000 0 . 9248 <nl> + vn - 0 . 2993 0 . 5898 0 . 7501 <nl> + vn - 1 . 0000 0 . 0020 - 0 . 0002 <nl> + vn - 1 . 0000 0 . 0038 0 . 0001 <nl> + vn 0 . 0600 0 . 9977 0 . 0322 <nl> + vn - 0 . 0298 0 . 6843 0 . 7286 <nl> + vn 0 . 5055 0 . 5000 0 . 7032 <nl> + vn 0 . 0437 0 . 7189 - 0 . 6937 <nl> + vn 0 . 0000 0 . 7072 - 0 . 7071 <nl> + vn 0 . 0000 0 . 9995 0 . 0332 <nl> + vn 0 . 0000 0 . 6588 0 . 7523 <nl> + vn 0 . 7695 0 . 2745 0 . 5767 <nl> + vn - 0 . 0367 0 . 5658 0 . 8237 <nl> + vn 0 . 9922 - 0 . 0577 0 . 1104 <nl> + vn 0 . 6917 - 0 . 0420 - 0 . 7210 <nl> + vn 0 . 0000 0 . 0027 - 1 . 0000 <nl> + vn 0 . 0000 0 . 5882 0 . 8087 <nl> + vn 0 . 1188 - 0 . 5887 0 . 7996 <nl> + vn 0 . 0321 0 . 6256 0 . 7795 <nl> + vn 0 . 0000 0 . 6147 0 . 7888 <nl> + vn 0 . 0000 - 0 . 5529 0 . 8332 <nl> + vn 0 . 0679 - 0 . 7238 - 0 . 6867 <nl> + vn 0 . 0000 - 0 . 7071 - 0 . 7071 <nl> + vn 0 . 0000 - 0 . 9998 0 . 0186 <nl> + vn 0 . 1008 - 0 . 9944 0 . 0303 <nl> + vn 0 . 1919 - 0 . 9589 0 . 2090 <nl> + vn 0 . 0000 - 0 . 9763 0 . 2164 <nl> + vn 0 . 8234 - 0 . 4090 0 . 3934 <nl> + vn 0 . 7783 - 0 . 6202 0 . 0974 <nl> + vn 0 . 4102 - 0 . 4276 0 . 8055 <nl> + vn 0 . 6229 - 0 . 5161 - 0 . 5878 <nl> + vn 0 . 3724 0 . 5216 0 . 7676 <nl> + vn 0 . 4590 0 . 4578 - 0 . 7614 <nl> + vn 0 . 7634 0 . 6050 - 0 . 2262 <nl> + vn 0 . 7634 - 0 . 6050 - 0 . 2262 <nl> + vn 0 . 4590 - 0 . 4578 - 0 . 7614 <nl> + vn 0 . 0969 - 0 . 9859 - 0 . 1366 <nl> + vn 0 . 0512 - 0 . 6235 - 0 . 7801 <nl> + vn 0 . 6229 - 0 . 5161 0 . 5878 <nl> + vn 0 . 6229 0 . 5161 0 . 5878 <nl> + vn 0 . 0679 0 . 7238 0 . 6867 <nl> + vn 0 . 0679 - 0 . 7238 0 . 6867 <nl> + vn 0 . 0969 0 . 9859 - 0 . 1366 <nl> + vn 0 . 0512 0 . 6235 - 0 . 7801 <nl> + vn 0 . 5774 - 0 . 5774 0 . 5774 <nl> + vn - 0 . 5774 - 0 . 5774 0 . 5774 <nl> + vn 0 . 7284 0 . 6778 - 0 . 0997 <nl> + vn 0 . 4869 0 . 5930 - 0 . 6413 <nl> + vn 0 . 4869 - 0 . 5930 - 0 . 6413 <nl> + vn - 0 . 5774 - 0 . 5774 - 0 . 5774 <nl> + vn 0 . 7284 - 0 . 6778 - 0 . 0997 <nl> + vn 0 . 9749 0 . 0000 0 . 2225 <nl> + vn 0 . 9229 0 . 0000 - 0 . 3851 <nl> + vn 0 . 7168 0 . 6298 - 0 . 2991 <nl> + vn 0 . 6993 0 . 6775 0 . 2279 <nl> + vn 0 . 4259 0 . 4935 0 . 7583 <nl> + vn 0 . 5321 0 . 0000 0 . 8467 <nl> + vn 0 . 3834 0 . 0025 - 0 . 9236 <nl> + vn 0 . 2951 0 . 6307 - 0 . 7177 <nl> + vn - 0 . 4196 - 0 . 5423 0 . 7279 <nl> + vn - 0 . 0000 - 0 . 8481 0 . 5299 <nl> + vn - 0 . 0000 0 . 8416 0 . 5402 <nl> + vn - 0 . 4121 0 . 5543 0 . 7231 <nl> + vn - 0 . 7140 0 . 6273 - 0 . 3108 <nl> + vn 0 . 0000 0 . 5812 - 0 . 8138 <nl> + vn - 0 . 7312 - 0 . 6081 - 0 . 3090 <nl> + vn - 0 . 0000 - 0 . 5903 - 0 . 8072 <nl> + vn - 0 . 0000 0 . 0000 1 . 0000 <nl> + vn - 0 . 6942 0 . 2393 0 . 6788 <nl> + vn - 0 . 5446 - 0 . 6867 0 . 4815 <nl> + vn - 0 . 0000 - 0 . 5890 0 . 8081 <nl> + vn - 0 . 0000 - 0 . 7596 - 0 . 6504 <nl> + vn 0 . 0592 - 0 . 7094 - 0 . 7024 <nl> + vn 0 . 1392 0 . 4825 - 0 . 8648 <nl> + vn - 0 . 7182 0 . 6312 0 . 2928 <nl> + vn - 0 . 5331 0 . 5694 - 0 . 6258 <nl> + vn - 0 . 5501 - 0 . 5468 - 0 . 6312 <nl> + vn - 0 . 7435 - 0 . 6026 0 . 2900 <nl> + vn - 0 . 3724 0 . 5216 0 . 7676 <nl> + vn - 0 . 0321 0 . 6256 0 . 7795 <nl> + vn 0 . 0367 0 . 5658 0 . 8237 <nl> + vn - 0 . 7695 0 . 2745 0 . 5767 <nl> + vn - 0 . 1188 - 0 . 5887 0 . 7996 <nl> + vn - 0 . 1919 - 0 . 9589 0 . 2090 <nl> + vn - 0 . 8234 - 0 . 4090 0 . 3934 <nl> + vn - 0 . 7783 - 0 . 6202 0 . 0974 <nl> + vn - 0 . 1008 - 0 . 9944 0 . 0303 <nl> + vn - 0 . 4259 0 . 4935 0 . 7583 <nl> + vn - 0 . 5321 0 . 0000 0 . 8467 <nl> + vn 0 . 0000 0 . 5963 0 . 8028 <nl> + vn 0 . 6539 - 0 . 5970 0 . 4647 <nl> + vn 0 . 6539 0 . 5970 0 . 4647 <nl> + vn 0 . 2585 0 . 6183 0 . 7422 <nl> + vn 0 . 2585 - 0 . 6183 0 . 7422 <nl> + vn 0 . 6323 0 . 5904 - 0 . 5016 <nl> + vn 0 . 1731 0 . 6493 - 0 . 7405 <nl> + vn 0 . 6323 - 0 . 5904 - 0 . 5016 <nl> + vn 0 . 1731 - 0 . 6493 - 0 . 7405 <nl> + vn 0 . 0000 0 . 9893 0 . 1460 <nl> + vn - 0 . 6993 0 . 6775 0 . 2279 <nl> + vn - 0 . 7168 0 . 6298 - 0 . 2991 <nl> + vn - 0 . 2951 0 . 6307 - 0 . 7177 <nl> + vn 0 . 0000 0 . 7083 - 0 . 7059 <nl> + vn - 0 . 3834 0 . 0025 - 0 . 9236 <nl> + vn - 0 . 0969 0 . 9859 - 0 . 1366 <nl> + vn - 0 . 0679 0 . 7238 0 . 6867 <nl> + vn 0 . 0000 0 . 7071 0 . 7071 <nl> + vn 0 . 0000 0 . 9916 - 0 . 1292 <nl> + vn - 0 . 0512 0 . 6235 - 0 . 7801 <nl> + vn 0 . 0000 0 . 6098 - 0 . 7925 <nl> + vn - 0 . 0512 - 0 . 6235 - 0 . 7801 <nl> + vn 0 . 0000 - 0 . 6098 - 0 . 7925 <nl> + vn 0 . 0000 - 0 . 9916 - 0 . 1292 <nl> + vn - 0 . 0969 - 0 . 9859 - 0 . 1366 <nl> + vn - 0 . 0679 - 0 . 7238 0 . 6867 <nl> + vn 0 . 0000 - 0 . 7071 0 . 7071 <nl> + vn 0 . 0000 0 . 6303 - 0 . 7764 <nl> + vn 0 . 5490 0 . 6303 - 0 . 5490 <nl> + vn - 0 . 5490 0 . 6303 - 0 . 5490 <nl> + vn - 0 . 7764 0 . 6303 - 0 . 0000 <nl> + vn - 0 . 5490 0 . 6303 0 . 5490 <nl> + vn - 0 . 0000 0 . 6303 0 . 7764 <nl> + vn 0 . 5490 0 . 6303 0 . 5490 <nl> + vn 0 . 7764 0 . 6303 - 0 . 0000 <nl> + vn - 0 . 0000 1 . 0000 - 0 . 0000 <nl> + vn - 0 . 0000 0 . 7764 0 . 6303 <nl> + vn - 0 . 0000 - 1 . 0000 - 0 . 0000 <nl> + vn - 0 . 0000 - 0 . 7764 0 . 6303 <nl> + vn 0 . 4196 - 0 . 5423 0 . 7279 <nl> + vn 0 . 4121 0 . 5543 0 . 7231 <nl> + vn 0 . 7140 0 . 6273 - 0 . 3108 <nl> + vn 0 . 7312 - 0 . 6081 - 0 . 3090 <nl> + vn 0 . 5446 - 0 . 6867 0 . 4815 <nl> + vn 0 . 6942 0 . 2393 0 . 6788 <nl> + vn - 0 . 1392 0 . 4825 - 0 . 8648 <nl> + vn - 0 . 0592 - 0 . 7094 - 0 . 7024 <nl> + vn 0 . 5501 - 0 . 5468 - 0 . 6312 <nl> + vn 0 . 5331 0 . 5694 - 0 . 6258 <nl> + vn 0 . 7182 0 . 6312 0 . 2928 <nl> + vn 0 . 7435 - 0 . 6026 0 . 2900 <nl> + vn 0 . 6371 - 0 . 2099 0 . 7416 <nl> + vn 0 . 6884 - 0 . 7230 0 . 0579 <nl> + vn 0 . 6240 - 0 . 6814 0 . 3825 <nl> + vn - 0 . 0848 0 . 9960 0 . 0288 <nl> + vn - 0 . 7829 0 . 6009 0 . 1613 <nl> + vn - 0 . 4732 0 . 5593 0 . 6806 <nl> + vn - 0 . 0437 0 . 6873 0 . 7251 <nl> + vn - 0 . 7650 0 . 6441 0 . 0002 <nl> + vn - 0 . 0856 0 . 9963 - 0 . 0000 <nl> + vn 0 . 4494 0 . 8934 - 0 . 0001 <nl> + vn 0 . 7001 0 . 7138 0 . 0181 <nl> + vn 0 . 7097 0 . 6256 0 . 3239 <nl> + vn 0 . 2993 0 . 5898 0 . 7501 <nl> + vn - 0 . 0117 0 . 0000 0 . 9999 <nl> + vn - 0 . 5713 0 . 0000 0 . 8207 <nl> + vn - 0 . 9172 0 . 3679 0 . 1530 <nl> + vn - 1 . 0000 0 . 0000 0 . 0002 <nl> + vn - 0 . 6194 0 . 5215 - 0 . 5868 <nl> + vn - 0 . 0621 0 . 7227 - 0 . 6884 <nl> + vn - 0 . 0000 0 . 0000 - 1 . 0000 <nl> + vn - 0 . 7125 0 . 2937 - 0 . 6373 <nl> + vn - 0 . 0002 0 . 7071 - 0 . 7071 <nl> + vn 0 . 9226 - 0 . 0047 0 . 3857 <nl> + vn 0 . 3804 0 . 0000 0 . 9248 <nl> + vn 1 . 0000 0 . 0038 0 . 0001 <nl> + vn 1 . 0000 0 . 0020 - 0 . 0002 <nl> + vn - 0 . 0600 0 . 9977 0 . 0322 <nl> + vn - 0 . 5055 0 . 5000 0 . 7032 <nl> + vn 0 . 0298 0 . 6843 0 . 7286 <nl> + vn - 0 . 0437 0 . 7189 - 0 . 6937 <nl> + vn - 0 . 9922 - 0 . 0577 0 . 1104 <nl> + vn - 0 . 6917 - 0 . 0420 - 0 . 7210 <nl> + vn - 0 . 0679 - 0 . 7238 - 0 . 6867 <nl> + vn - 0 . 4102 - 0 . 4276 0 . 8055 <nl> + vn - 0 . 6229 - 0 . 5161 - 0 . 5878 <nl> + vn - 0 . 7634 - 0 . 6050 - 0 . 2262 <nl> + vn - 0 . 7634 0 . 6050 - 0 . 2262 <nl> + vn - 0 . 4590 0 . 4578 - 0 . 7614 <nl> + vn - 0 . 4590 - 0 . 4578 - 0 . 7614 <nl> + vn - 0 . 6229 0 . 5161 0 . 5878 <nl> + vn - 0 . 6229 - 0 . 5161 0 . 5878 <nl> + vn - 0 . 7284 0 . 6778 - 0 . 0997 <nl> + vn 0 . 5774 - 0 . 5774 - 0 . 5774 <nl> + vn - 0 . 4869 - 0 . 5930 - 0 . 6413 <nl> + vn - 0 . 4869 0 . 5930 - 0 . 6413 <nl> + vn - 0 . 7284 - 0 . 6778 - 0 . 0997 <nl> + vn - 0 . 9229 0 . 0000 - 0 . 3851 <nl> + vn - 0 . 9749 0 . 0000 0 . 2225 <nl> + vn - 0 . 9437 - 0 . 0225 0 . 3300 <nl> + vn - 0 . 3837 0 . 8159 0 . 4325 <nl> + vn - 0 . 5046 - 0 . 3240 0 . 8002 <nl> + vn - 0 . 0164 0 . 5638 0 . 8258 <nl> + vn 0 . 1362 - 0 . 6289 0 . 7655 <nl> + vn 0 . 5195 0 . 3088 0 . 7967 <nl> + vn 0 . 6034 - 0 . 7585 0 . 2461 <nl> + vn 0 . 9102 0 . 2004 0 . 3623 <nl> + vn 0 . 6233 - 0 . 6370 - 0 . 4536 <nl> + vn 0 . 9269 0 . 3021 - 0 . 2229 <nl> + vn - 0 . 1903 - 0 . 7733 - 0 . 6049 <nl> + vn - 0 . 4309 - 0 . 8869 - 0 . 1663 <nl> + vn - 0 . 5326 - 0 . 6104 - 0 . 5863 <nl> + vn - 0 . 7821 - 0 . 5412 - 0 . 3089 <nl> + vn - 0 . 7927 - 0 . 6061 0 . 0649 <nl> + vn - 0 . 5582 - 0 . 7672 0 . 3161 <nl> + vn - 0 . 2159 - 0 . 9300 0 . 2975 <nl> + vn 0 . 0337 - 0 . 9992 0 . 0201 <nl> + vn 0 . 0443 - 0 . 9343 - 0 . 3537 <nl> + vn 0 . 4309 0 . 8869 0 . 1663 <nl> + vn 0 . 2651 0 . 8276 0 . 4949 <nl> + vn 0 . 5179 0 . 7073 0 . 4811 <nl> + vn 0 . 7023 0 . 6561 0 . 2762 <nl> + vn 0 . 7101 0 . 7041 0 . 0001 <nl> + vn 0 . 5369 0 . 8230 - 0 . 1854 <nl> + vn 0 . 2840 0 . 9433 - 0 . 1717 <nl> + vn 0 . 0997 0 . 9945 0 . 0332 <nl> + vn 0 . 0918 0 . 9465 0 . 3093 <nl> + vn 0 . 4828 0 . 8115 0 . 3292 <nl> + vn 0 . 3543 0 . 8726 0 . 3362 <nl> + vn 0 . 5765 0 . 7855 0 . 2251 <nl> + vn - 0 . 2585 0 . 6183 0 . 7422 <nl> + vn - 0 . 6539 0 . 5970 0 . 4647 <nl> + vn - 0 . 6539 - 0 . 5970 0 . 4647 <nl> + vn - 0 . 2585 - 0 . 6183 0 . 7422 <nl> + vn - 0 . 1731 0 . 6493 - 0 . 7405 <nl> + vn - 0 . 6323 0 . 5904 - 0 . 5016 <nl> + vn - 0 . 1731 - 0 . 6493 - 0 . 7405 <nl> + vn - 0 . 6323 - 0 . 5904 - 0 . 5016 <nl> + vn 0 . 5805 0 . 8098 0 . 0848 <nl> + vn 0 . 4924 0 . 8703 - 0 . 0095 <nl> + vn 0 . 3640 0 . 9314 - 0 . 0025 <nl> + vn 0 . 2703 0 . 9574 0 . 1016 <nl> + vn 0 . 2663 0 . 9330 0 . 2419 <nl> + vn - 0 . 0000 0 . 6303 - 0 . 7764 <nl> + vn 0 . 0000 0 . 6303 0 . 7764 <nl> + # 331 vertex normals <nl> + <nl> + vt 0 . 3471 0 . 0763 0 . 0000 <nl> + vt 0 . 4009 0 . 0969 0 . 0000 <nl> + vt 0 . 4005 0 . 0921 0 . 0000 <nl> + vt 0 . 3963 0 . 0406 0 . 0000 <nl> + vt 0 . 3698 0 . 0396 0 . 0000 <nl> + vt 0 . 4270 0 . 1552 0 . 0000 <nl> + vt 0 . 4282 0 . 2181 0 . 0000 <nl> + vt 0 . 4235 0 . 2182 0 . 0000 <nl> + vt 0 . 4222 0 . 1553 0 . 0000 <nl> + vt 0 . 4317 0 . 1551 0 . 0000 <nl> + vt 0 . 4329 0 . 2180 0 . 0000 <nl> + vt 0 . 4365 0 . 1550 0 . 0000 <nl> + vt 0 . 4377 0 . 2179 0 . 0000 <nl> + vt 0 . 4412 0 . 1548 0 . 0000 <nl> + vt 0 . 4424 0 . 2178 0 . 0000 <nl> + vt 0 . 4460 0 . 1547 0 . 0000 <nl> + vt 0 . 4475 0 . 2178 0 . 0000 <nl> + vt 0 . 4128 0 . 1555 0 . 0000 <nl> + vt 0 . 4140 0 . 2184 0 . 0000 <nl> + vt 0 . 4093 0 . 2185 0 . 0000 <nl> + vt 0 . 4080 0 . 1556 0 . 0000 <nl> + vt 0 . 4175 0 . 1554 0 . 0000 <nl> + vt 0 . 4187 0 . 2183 0 . 0000 <nl> + vt 0 . 4459 0 . 2658 0 . 0000 <nl> + vt 0 . 4270 0 . 2730 0 . 0000 <nl> + vt 0 . 4283 0 . 2466 0 . 0000 <nl> + vt 0 . 4086 0 . 2647 0 . 0000 <nl> + vt 0 . 4013 0 . 2458 0 . 0000 <nl> + vt 0 . 4096 0 . 2274 0 . 0000 <nl> + vt 0 . 4288 0 . 2208 0 . 0000 <nl> + vt 0 . 4464 0 . 2294 0 . 0000 <nl> + vt 0 . 4533 0 . 2473 0 . 0000 <nl> + vt 0 . 4272 0 . 2724 0 . 0000 <nl> + vt 0 . 4086 0 . 2649 0 . 0000 <nl> + vt 0 . 4285 0 . 2468 0 . 0000 <nl> + vt 0 . 4011 0 . 2459 0 . 0000 <nl> + vt 0 . 4464 0 . 2295 0 . 0000 <nl> + vt 0 . 4287 0 . 2211 0 . 0000 <nl> + vt 0 . 4531 0 . 2475 0 . 0000 <nl> + vt 0 . 4457 0 . 2656 0 . 0000 <nl> + vt 0 . 4097 0 . 2275 0 . 0000 <nl> + vt 0 . 3469 0 . 0332 0 . 0000 <nl> + vt 0 . 2658 0 . 0336 0 . 0000 <nl> + vt 0 . 2657 0 . 0070 0 . 0000 <nl> + vt 0 . 3468 0 . 0066 0 . 0000 <nl> + vt 0 . 2660 0 . 0768 0 . 0000 <nl> + vt 0 . 3478 0 . 2063 0 . 0000 <nl> + vt 0 . 2667 0 . 2067 0 . 0000 <nl> + vt 0 . 2665 0 . 1803 0 . 0000 <nl> + vt 0 . 3477 0 . 1798 0 . 0000 <nl> + vt 0 . 2663 0 . 1299 0 . 0000 <nl> + vt 0 . 3474 0 . 1295 0 . 0000 <nl> + vt 0 . 4067 0 . 1677 0 . 0000 <nl> + vt 0 . 3802 0 . 1677 0 . 0000 <nl> + vt 0 . 4939 0 . 3395 0 . 0000 <nl> + vt 0 . 4927 0 . 3933 0 . 0000 <nl> + vt 0 . 4874 0 . 3936 0 . 0000 <nl> + vt 0 . 4818 0 . 3400 0 . 0000 <nl> + vt 0 . 4927 0 . 3979 0 . 0000 <nl> + vt 0 . 4876 0 . 3972 0 . 0000 <nl> + vt 0 . 4888 0 . 4508 0 . 0000 <nl> + vt 0 . 4770 0 . 4492 0 . 0000 <nl> + vt 0 . 5385 0 . 4002 0 . 0000 <nl> + vt 0 . 5383 0 . 3899 0 . 0000 <nl> + vt 0 . 4535 0 . 3936 0 . 0000 <nl> + vt 0 . 4539 0 . 4012 0 . 0000 <nl> + vt 0 . 4258 0 . 4863 0 . 0000 <nl> + vt 0 . 4258 0 . 5053 0 . 0000 <nl> + vt 0 . 4186 0 . 5053 0 . 0000 <nl> + vt 0 . 4186 0 . 4863 0 . 0000 <nl> + vt 0 . 4257 0 . 5256 0 . 0000 <nl> + vt 0 . 4185 0 . 5256 0 . 0000 <nl> + vt 0 . 6112 0 . 4414 0 . 0000 <nl> + vt 0 . 6112 0 . 4866 0 . 0000 <nl> + vt 0 . 6565 0 . 4866 0 . 0000 <nl> + vt 0 . 6565 0 . 4414 0 . 0000 <nl> + vt 0 . 5660 0 . 4866 0 . 0000 <nl> + vt 0 . 5660 0 . 4414 0 . 0000 <nl> + vt 0 . 5207 0 . 4414 0 . 0000 <nl> + vt 0 . 5207 0 . 4866 0 . 0000 <nl> + vt 0 . 3522 0 . 2650 0 . 0000 <nl> + vt 0 . 3552 0 . 2650 0 . 0000 <nl> + vt 0 . 3552 0 . 2250 0 . 0000 <nl> + vt 0 . 3522 0 . 2250 0 . 0000 <nl> + vt 0 . 3582 0 . 2650 0 . 0000 <nl> + vt 0 . 3582 0 . 2250 0 . 0000 <nl> + vt 0 . 3612 0 . 2650 0 . 0000 <nl> + vt 0 . 3612 0 . 2250 0 . 0000 <nl> + vt 0 . 3642 0 . 2650 0 . 0000 <nl> + vt 0 . 3642 0 . 2250 0 . 0000 <nl> + vt 0 . 3672 0 . 2650 0 . 0000 <nl> + vt 0 . 3672 0 . 2250 0 . 0000 <nl> + vt 0 . 3431 0 . 2650 0 . 0000 <nl> + vt 0 . 3461 0 . 2650 0 . 0000 <nl> + vt 0 . 3461 0 . 2250 0 . 0000 <nl> + vt 0 . 3431 0 . 2250 0 . 0000 <nl> + vt 0 . 3491 0 . 2650 0 . 0000 <nl> + vt 0 . 3491 0 . 2250 0 . 0000 <nl> + vt 0 . 3283 0 . 2964 0 . 0000 <nl> + vt 0 . 3166 0 . 2840 0 . 0000 <nl> + vt 0 . 3161 0 . 3011 0 . 0000 <nl> + vt 0 . 3042 0 . 2957 0 . 0000 <nl> + vt 0 . 2995 0 . 2835 0 . 0000 <nl> + vt 0 . 3048 0 . 2715 0 . 0000 <nl> + vt 0 . 3171 0 . 2669 0 . 0000 <nl> + vt 0 . 3290 0 . 2722 0 . 0000 <nl> + vt 0 . 9046 0 . 6493 0 . 0000 <nl> + vt 0 . 9008 0 . 5386 0 . 0000 <nl> + vt 0 . 9379 0 . 5395 0 . 0000 <nl> + vt 0 . 9873 0 . 6497 0 . 0000 <nl> + vt 0 . 9864 0 . 7515 0 . 0000 <nl> + vt 0 . 9038 0 . 7508 0 . 0000 <nl> + vt 0 . 8159 0 . 7500 0 . 0000 <nl> + vt 0 . 8170 0 . 6483 0 . 0000 <nl> + vt 0 . 8177 0 . 5740 0 . 0000 <nl> + vt 0 . 9013 0 . 5303 0 . 0000 <nl> + vt 0 . 9389 0 . 5311 0 . 0000 <nl> + vt 0 . 9949 0 . 6465 0 . 0000 <nl> + vt 0 . 9456 0 . 5363 0 . 0000 <nl> + vt 0 . 9947 0 . 7516 0 . 0000 <nl> + vt 0 . 9956 0 . 6498 0 . 0000 <nl> + vt 0 . 9023 0 . 9864 0 . 0000 <nl> + vt 0 . 9017 0 . 9782 0 . 0000 <nl> + vt 0 . 9843 0 . 9792 0 . 0000 <nl> + vt 0 . 9856 0 . 9874 0 . 0000 <nl> + vt 0 . 8139 0 . 9861 0 . 0000 <nl> + vt 0 . 8140 0 . 9777 0 . 0000 <nl> + vt 0 . 8121 0 . 5677 0 . 0000 <nl> + vt 0 . 8481 0 . 5316 0 . 0000 <nl> + vt 0 . 8535 0 . 5379 0 . 0000 <nl> + vt 0 . 8537 0 . 5295 0 . 0000 <nl> + vt 0 . 8075 0 . 7500 0 . 0000 <nl> + vt 0 . 8085 0 . 6482 0 . 0000 <nl> + vt 0 . 8093 0 . 5737 0 . 0000 <nl> + vt 0 . 9926 0 . 9793 0 . 0000 <nl> + vt 0 . 6984 0 . 7506 0 . 0000 <nl> + vt 0 . 6880 0 . 5036 0 . 0000 <nl> + vt 0 . 7276 0 . 4986 0 . 0000 <nl> + vt 0 . 7809 0 . 7510 0 . 0000 <nl> + vt 0 . 7797 0 . 9806 0 . 0000 <nl> + vt 0 . 6993 0 . 9818 0 . 0000 <nl> + vt 0 . 6361 0 . 9823 0 . 0000 <nl> + vt 0 . 6345 0 . 7503 0 . 0000 <nl> + vt 0 . 6369 0 . 5031 0 . 0000 <nl> + vt 0 . 7269 0 . 4944 0 . 0000 <nl> + vt 0 . 6877 0 . 4992 0 . 0000 <nl> + vt 0 . 7852 0 . 7506 0 . 0000 <nl> + vt 0 . 7319 0 . 4978 0 . 0000 <nl> + vt 0 . 7828 0 . 9817 0 . 0000 <nl> + vt 0 . 6995 0 . 9861 0 . 0000 <nl> + vt 0 . 6361 0 . 9866 0 . 0000 <nl> + vt 0 . 6369 0 . 4988 0 . 0000 <nl> + vt 0 . 0588 0 . 0078 0 . 0000 <nl> + vt 0 . 0582 0 . 0539 0 . 0000 <nl> + vt 0 . 0081 0 . 0539 0 . 0000 <nl> + vt 0 . 0072 0 . 0084 0 . 0000 <nl> + vt 0 . 0599 0 . 1221 0 . 0000 <nl> + vt 0 . 0082 0 . 1222 0 . 0000 <nl> + vt 0 . 0622 0 . 9897 0 . 0000 <nl> + vt 0 . 0578 0 . 9136 0 . 0000 <nl> + vt 0 . 0088 0 . 9139 0 . 0000 <nl> + vt 0 . 0088 0 . 9914 0 . 0000 <nl> + vt 0 . 0088 0 . 7305 0 . 0000 <nl> + vt 0 . 0587 0 . 7306 0 . 0000 <nl> + vt 0 . 0455 0 . 5100 0 . 0000 <nl> + vt 0 . 0088 0 . 5099 0 . 0000 <nl> + vt 0 . 0991 0 . 1164 0 . 0000 <nl> + vt 0 . 1255 0 . 0638 0 . 0000 <nl> + vt 0 . 2859 0 . 3035 0 . 0000 <nl> + vt 0 . 2248 0 . 3404 0 . 0000 <nl> + vt 0 . 0814 0 . 5109 0 . 0000 <nl> + vt 0 . 0593 0 . 4884 0 . 0000 <nl> + vt 0 . 0473 0 . 4889 0 . 0000 <nl> + vt 0 . 1290 0 . 9746 0 . 0000 <nl> + vt 0 . 1231 0 . 9162 0 . 0000 <nl> + vt 0 . 0733 0 . 0137 0 . 0000 <nl> + vt 0 . 0723 0 . 0535 0 . 0000 <nl> + vt 0 . 1243 0 . 7308 0 . 0000 <nl> + vt 0 . 4076 0 . 5055 0 . 0000 <nl> + vt 0 . 3467 0 . 5423 0 . 0000 <nl> + vt 0 . 1027 0 . 0300 0 . 0000 <nl> + vt 0 . 2520 0 . 8877 0 . 0000 <nl> + vt 0 . 2753 0 . 8002 0 . 0000 <nl> + vt 0 . 3662 0 . 8231 0 . 0000 <nl> + vt 0 . 3188 0 . 9101 0 . 0000 <nl> + vt 0 . 4675 0 . 3531 0 . 0000 <nl> + vt 0 . 4983 0 . 2925 0 . 0000 <nl> + vt 0 . 4364 0 . 2906 0 . 0000 <nl> + vt 0 . 4248 0 . 3514 0 . 0000 <nl> + vt 0 . 2909 0 . 5936 0 . 0000 <nl> + vt 0 . 2839 0 . 6954 0 . 0000 <nl> + vt 0 . 1998 0 . 6985 0 . 0000 <nl> + vt 0 . 2053 0 . 5712 0 . 0000 <nl> + vt 0 . 1995 0 . 8032 0 . 0000 <nl> + vt 0 . 1886 0 . 8877 0 . 0000 <nl> + vt 0 . 2586 0 . 9636 0 . 0000 <nl> + vt 0 . 1940 0 . 9816 0 . 0000 <nl> + vt 0 . 5003 0 . 2126 0 . 0000 <nl> + vt 0 . 4380 0 . 2111 0 . 0000 <nl> + vt 0 . 3842 0 . 7116 0 . 0000 <nl> + vt 0 . 4162 0 . 9972 0 . 0000 <nl> + vt 0 . 4162 0 . 9568 0 . 0000 <nl> + vt 0 . 4567 0 . 9568 0 . 0000 <nl> + vt 0 . 4568 0 . 9972 0 . 0000 <nl> + vt 0 . 4167 0 . 8246 0 . 0000 <nl> + vt 0 . 4562 0 . 8235 0 . 0000 <nl> + vt 0 . 4258 0 . 7700 0 . 0000 <nl> + vt 0 . 4227 0 . 7267 0 . 0000 <nl> + vt 0 . 4499 0 . 7248 0 . 0000 <nl> + vt 0 . 4528 0 . 7682 0 . 0000 <nl> + vt 0 . 1692 0 . 5123 0 . 0000 <nl> + vt 0 . 0752 0 . 4204 0 . 0000 <nl> + vt 0 . 1029 0 . 3921 0 . 0000 <nl> + vt 0 . 1967 0 . 4837 0 . 0000 <nl> + vt 0 . 3770 0 . 8226 0 . 0000 <nl> + vt 0 . 3759 0 . 9564 0 . 0000 <nl> + vt 0 . 4959 0 . 9570 0 . 0000 <nl> + vt 0 . 4967 0 . 8229 0 . 0000 <nl> + vt 0 . 3842 0 . 7648 0 . 0000 <nl> + vt 0 . 2353 0 . 5196 0 . 0000 <nl> + vt 0 . 2184 0 . 5378 0 . 0000 <nl> + vt 0 . 4948 0 . 7667 0 . 0000 <nl> + vt 0 . 0958 0 . 2088 0 . 0000 <nl> + vt 0 . 1108 0 . 2706 0 . 0000 <nl> + vt 0 . 0708 0 . 2802 0 . 0000 <nl> + vt 0 . 0626 0 . 2229 0 . 0000 <nl> + vt 0 . 0393 0 . 1588 0 . 0000 <nl> + vt 0 . 0570 0 . 1477 0 . 0000 <nl> + vt 0 . 1029 0 . 3079 0 . 0000 <nl> + vt 0 . 0728 0 . 3428 0 . 0000 <nl> + vt 0 . 0408 0 . 3151 0 . 0000 <nl> + vt 0 . 3337 0 . 2844 0 . 0000 <nl> + vt 0 . 3136 0 . 2652 0 . 0000 <nl> + vt 0 . 3167 0 . 2652 0 . 0000 <nl> + vt 0 . 3159 0 . 2244 0 . 0000 <nl> + vt 0 . 3128 0 . 2245 0 . 0000 <nl> + vt 0 . 3198 0 . 2651 0 . 0000 <nl> + vt 0 . 3190 0 . 2244 0 . 0000 <nl> + vt 0 . 3228 0 . 2650 0 . 0000 <nl> + vt 0 . 3220 0 . 2243 0 . 0000 <nl> + vt 0 . 3259 0 . 2650 0 . 0000 <nl> + vt 0 . 3251 0 . 2242 0 . 0000 <nl> + vt 0 . 3292 0 . 2650 0 . 0000 <nl> + vt 0 . 3282 0 . 2241 0 . 0000 <nl> + vt 0 . 3045 0 . 2654 0 . 0000 <nl> + vt 0 . 3075 0 . 2654 0 . 0000 <nl> + vt 0 . 3067 0 . 2246 0 . 0000 <nl> + vt 0 . 3036 0 . 2247 0 . 0000 <nl> + vt 0 . 3106 0 . 2653 0 . 0000 <nl> + vt 0 . 3098 0 . 2246 0 . 0000 <nl> + vt 0 . 3683 0 . 2960 0 . 0000 <nl> + vt 0 . 3565 0 . 2836 0 . 0000 <nl> + vt 0 . 3561 0 . 3007 0 . 0000 <nl> + vt 0 . 3441 0 . 2953 0 . 0000 <nl> + vt 0 . 3394 0 . 2831 0 . 0000 <nl> + vt 0 . 3448 0 . 2712 0 . 0000 <nl> + vt 0 . 3570 0 . 2665 0 . 0000 <nl> + vt 0 . 3690 0 . 2718 0 . 0000 <nl> + vt 0 . 3737 0 . 2841 0 . 0000 <nl> + vt 0 . 6213 0 . 9820 0 . 0000 <nl> + vt 0 . 6150 0 . 7234 0 . 0000 <nl> + vt 0 . 5947 0 . 7248 0 . 0000 <nl> + vt 0 . 6125 0 . 9826 0 . 0000 <nl> + vt 0 . 5812 0 . 9670 0 . 0000 <nl> + vt 0 . 4960 0 . 6751 0 . 0000 <nl> + vt 0 . 5726 0 . 9695 0 . 0000 <nl> + vt 0 . 4765 0 . 6808 0 . 0000 <nl> + vt 0 . 1112 0 . 3370 0 . 0000 <nl> + vt 0 . 2919 0 . 5292 0 . 0000 <nl> + vt 0 . 3019 0 . 4948 0 . 0000 <nl> + vt 0 . 1425 0 . 2289 0 . 0000 <nl> + vt 0 . 5772 0 . 9749 0 . 0000 <nl> + vt 0 . 6085 0 . 9905 0 . 0000 <nl> + vt 0 . 3608 0 . 3837 0 . 0000 <nl> + vt 0 . 4355 0 . 4520 0 . 0000 <nl> + vt 0 . 4532 0 . 4332 0 . 0000 <nl> + vt 0 . 3823 0 . 3602 0 . 0000 <nl> + vt 0 . 3742 0 . 6360 0 . 0000 <nl> + vt 0 . 3713 0 . 6667 0 . 0000 <nl> + vt 0 . 4407 0 . 6681 0 . 0000 <nl> + vt 0 . 4434 0 . 6426 0 . 0000 <nl> + vt 0 . 5257 0 . 3814 0 . 0000 <nl> + vt 0 . 5103 0 . 2261 0 . 0000 <nl> + vt 0 . 5573 0 . 2654 0 . 0000 <nl> + vt 0 . 5691 0 . 3841 0 . 0000 <nl> + vt 0 . 6013 0 . 6081 0 . 0000 <nl> + vt 0 . 6036 0 . 6610 0 . 0000 <nl> + vt 0 . 6169 0 . 6604 0 . 0000 <nl> + vt 0 . 6146 0 . 6075 0 . 0000 <nl> + vt 0 . 0088 0 . 4884 0 . 0000 <nl> + vt 0 . 0393 0 . 1379 0 . 0000 <nl> + vt 0 . 0077 0 . 1378 0 . 0000 <nl> + vt 0 . 0077 0 . 1578 0 . 0000 <nl> + vt 0 . 9484 0 . 4463 0 . 0000 <nl> + vt 0 . 9005 0 . 4300 0 . 0000 <nl> + vt 0 . 9388 0 . 3179 0 . 0000 <nl> + vt 0 . 9866 0 . 3343 0 . 0000 <nl> + vt 0 . 7531 0 . 4310 0 . 0000 <nl> + vt 0 . 7262 0 . 3193 0 . 0000 <nl> + vt 0 . 7039 0 . 4428 0 . 0000 <nl> + vt 0 . 6771 0 . 3311 0 . 0000 <nl> + vt 0 . 2531 0 . 0136 0 . 0000 <nl> + vt 0 . 1783 0 . 0311 0 . 0000 <nl> + vt 0 . 1783 0 . 1297 0 . 0000 <nl> + vt 0 . 2531 0 . 1558 0 . 0000 <nl> + vt 0 . 7534 0 . 4815 0 . 0000 <nl> + vt 0 . 9009 0 . 4806 0 . 0000 <nl> + vt 0 . 0077 0 . 2224 0 . 0000 <nl> + vt 0 . 0077 0 . 2843 0 . 0000 <nl> + vt 0 . 0077 0 . 3165 0 . 0000 <nl> + vt 0 . 0413 0 . 3585 0 . 0000 <nl> + vt 0 . 0077 0 . 3588 0 . 0000 <nl> + vt 0 . 1380 0 . 6955 0 . 0000 <nl> + vt 0 . 1380 0 . 8042 0 . 0000 <nl> + vt 0 . 1380 0 . 8914 0 . 0000 <nl> + vt 0 . 1380 0 . 9827 0 . 0000 <nl> + vt 0 . 3890 0 . 2902 0 . 0000 <nl> + vt 0 . 3891 0 . 3514 0 . 0000 <nl> + vt 0 . 3905 0 . 2102 0 . 0000 <nl> + vt 0 . 1380 0 . 5702 0 . 0000 <nl> + vt 0 . 6105 0 . 5983 0 . 0000 <nl> + vt 0 . 6020 0 . 6743 0 . 0000 <nl> + vt 0 . 5660 0 . 5319 0 . 0000 <nl> + vt 0 . 6112 0 . 5319 0 . 0000 <nl> + vt 0 . 6671 0 . 3568 0 . 0000 <nl> + vt 0 . 6707 0 . 3903 0 . 0000 <nl> + vt 0 . 9911 0 . 2404 0 . 0000 <nl> + vt 0 . 9911 0 . 2872 0 . 0000 <nl> + vt 0 . 9462 0 . 2871 0 . 0000 <nl> + vt 0 . 9463 0 . 2404 0 . 0000 <nl> + vt 0 . 7013 0 . 2433 0 . 0000 <nl> + vt 0 . 7013 0 . 2842 0 . 0000 <nl> + vt 0 . 6620 0 . 2843 0 . 0000 <nl> + vt 0 . 6620 0 . 2432 0 . 0000 <nl> + vt 0 . 7399 0 . 2434 0 . 0000 <nl> + vt 0 . 7399 0 . 2840 0 . 0000 <nl> + vt 0 . 7787 0 . 2431 0 . 0000 <nl> + vt 0 . 7787 0 . 2842 0 . 0000 <nl> + vt 0 . 8182 0 . 2427 0 . 0000 <nl> + vt 0 . 8182 0 . 2846 0 . 0000 <nl> + vt 0 . 8589 0 . 2417 0 . 0000 <nl> + vt 0 . 8588 0 . 2856 0 . 0000 <nl> + vt 0 . 9017 0 . 2409 0 . 0000 <nl> + vt 0 . 9017 0 . 2865 0 . 0000 <nl> + vt 0 . 9733 0 . 2072 0 . 0000 <nl> + vt 0 . 9119 0 . 2326 0 . 0000 <nl> + vt 0 . 9119 0 . 1424 0 . 0000 <nl> + vt 0 . 8505 0 . 2072 0 . 0000 <nl> + vt 0 . 8251 0 . 1458 0 . 0000 <nl> + vt 0 . 8505 0 . 0845 0 . 0000 <nl> + vt 0 . 9119 0 . 0590 0 . 0000 <nl> + vt 0 . 9733 0 . 0845 0 . 0000 <nl> + vt 0 . 9987 0 . 1458 0 . 0000 <nl> + vt 0 . 6112 0 . 3961 0 . 0000 <nl> + vt 0 . 5660 0 . 3961 0 . 0000 <nl> + vt 0 . 4257 0 . 5463 0 . 0000 <nl> + vt 0 . 4184 0 . 5462 0 . 0000 <nl> + vt 0 . 4256 0 . 5658 0 . 0000 <nl> + vt 0 . 4184 0 . 5658 0 . 0000 <nl> + vt 0 . 4256 0 . 5832 0 . 0000 <nl> + vt 0 . 4183 0 . 5832 0 . 0000 <nl> + vt 0 . 4255 0 . 5977 0 . 0000 <nl> + vt 0 . 4183 0 . 5978 0 . 0000 <nl> + vt 0 . 4255 0 . 6090 0 . 0000 <nl> + vt 0 . 4183 0 . 6092 0 . 0000 <nl> + vt 0 . 4255 0 . 6165 0 . 0000 <nl> + vt 0 . 4182 0 . 6169 0 . 0000 <nl> + vt 0 . 3594 0 . 5738 0 . 0000 <nl> + vt 0 . 3462 0 . 5864 0 . 0000 <nl> + vt 0 . 3459 0 . 5682 0 . 0000 <nl> + vt 0 . 3332 0 . 5738 0 . 0000 <nl> + vt 0 . 3282 0 . 5866 0 . 0000 <nl> + vt 0 . 3335 0 . 5991 0 . 0000 <nl> + vt 0 . 3461 0 . 6043 0 . 0000 <nl> + vt 0 . 3588 0 . 5993 0 . 0000 <nl> + vt 0 . 3644 0 . 5867 0 . 0000 <nl> + vt 0 . 3461 0 . 5864 0 . 0000 <nl> + vt 0 . 3594 0 . 5998 0 . 0000 <nl> + vt 0 . 3460 0 . 6052 0 . 0000 <nl> + vt 0 . 3328 0 . 5996 0 . 0000 <nl> + vt 0 . 3273 0 . 5864 0 . 0000 <nl> + vt 0 . 3328 0 . 5731 0 . 0000 <nl> + vt 0 . 3461 0 . 5676 0 . 0000 <nl> + vt 0 . 3594 0 . 5730 0 . 0000 <nl> + vt 0 . 3649 0 . 5863 0 . 0000 <nl> + vt 0 . 3680 0 . 5650 0 . 0000 <nl> + vt 0 . 3764 0 . 5870 0 . 0000 <nl> + vt 0 . 3457 0 . 5560 0 . 0000 <nl> + vt 0 . 3246 0 . 5656 0 . 0000 <nl> + vt 0 . 3165 0 . 5868 0 . 0000 <nl> + vt 0 . 3253 0 . 6074 0 . 0000 <nl> + vt 0 . 3460 0 . 6160 0 . 0000 <nl> + vt 0 . 3670 0 . 6079 0 . 0000 <nl> + vt 0 . 3726 0 . 6130 0 . 0000 <nl> + vt 0 . 3459 0 . 6238 0 . 0000 <nl> + vt 0 . 3460 0 . 6188 0 . 0000 <nl> + vt 0 . 3690 0 . 6095 0 . 0000 <nl> + vt 0 . 3196 0 . 6127 0 . 0000 <nl> + vt 0 . 3231 0 . 6092 0 . 0000 <nl> + vt 0 . 3087 0 . 5863 0 . 0000 <nl> + vt 0 . 3137 0 . 5864 0 . 0000 <nl> + vt 0 . 3196 0 . 5600 0 . 0000 <nl> + vt 0 . 3232 0 . 5635 0 . 0000 <nl> + vt 0 . 3460 0 . 5489 0 . 0000 <nl> + vt 0 . 3460 0 . 5539 0 . 0000 <nl> + vt 0 . 3725 0 . 5597 0 . 0000 <nl> + vt 0 . 3690 0 . 5633 0 . 0000 <nl> + vt 0 . 3837 0 . 5863 0 . 0000 <nl> + vt 0 . 3787 0 . 5863 0 . 0000 <nl> + # 409 texture coords <nl> + <nl> + g Object <nl> + usemtl _bossdefault <nl> + s 1 <nl> + f 1 / 1 / 1 2 / 2 / 2 3 / 3 / 2 4 / 4 / 3 <nl> + f 1 / 1 / 1 4 / 4 / 3 5 / 5 / 4 <nl> + f 6 / 3 / 5 7 / 2 / 5 8 / 1 / 6 9 / 4 / 7 <nl> + f 9 / 4 / 7 8 / 1 / 6 10 / 5 / 8 <nl> + f 11 / 6 / 9 12 / 7 / 10 13 / 8 / 11 14 / 9 / 12 <nl> + f 15 / 10 / 13 16 / 11 / 14 12 / 7 / 10 11 / 6 / 9 <nl> + f 17 / 12 / 15 18 / 13 / 16 16 / 11 / 14 15 / 10 / 13 <nl> + f 19 / 14 / 17 20 / 15 / 18 18 / 13 / 16 17 / 12 / 15 <nl> + f 21 / 16 / 19 22 / 17 / 20 20 / 15 / 18 19 / 14 / 17 <nl> + f 23 / 18 / 21 24 / 19 / 22 22 / 20 / 20 21 / 21 / 19 <nl> + f 25 / 22 / 23 26 / 23 / 24 24 / 19 / 22 23 / 18 / 21 <nl> + f 14 / 9 / 12 13 / 8 / 11 26 / 23 / 24 25 / 22 / 23 <nl> + f 13 / 24 / 11 12 / 25 / 10 27 / 26 / 25 <nl> + f 12 / 25 / 10 16 / 27 / 14 27 / 26 / 25 <nl> + f 16 / 27 / 14 18 / 28 / 16 27 / 26 / 25 <nl> + f 18 / 28 / 16 20 / 29 / 18 27 / 26 / 25 <nl> + f 20 / 29 / 18 22 / 30 / 20 27 / 26 / 25 <nl> + f 22 / 30 / 20 24 / 31 / 22 27 / 26 / 25 <nl> + f 24 / 31 / 22 26 / 32 / 24 27 / 26 / 25 <nl> + f 26 / 32 / 24 13 / 24 / 11 27 / 26 / 25 <nl> + f 15 / 33 / 13 11 / 34 / 9 28 / 35 / 26 <nl> + f 28 / 35 / 26 11 / 34 / 9 14 / 36 / 12 <nl> + f 21 / 37 / 19 28 / 35 / 26 23 / 38 / 21 <nl> + f 19 / 39 / 17 28 / 35 / 26 21 / 37 / 19 <nl> + f 15 / 33 / 13 28 / 35 / 26 17 / 40 / 15 <nl> + f 17 / 40 / 15 28 / 35 / 26 19 / 39 / 17 <nl> + f 23 / 38 / 21 28 / 35 / 26 25 / 41 / 23 <nl> + f 25 / 41 / 23 28 / 35 / 26 14 / 36 / 12 <nl> + f 29 / 8 / 14 30 / 7 / 27 31 / 6 / 28 32 / 9 / 13 <nl> + f 30 / 7 / 27 33 / 11 / 11 34 / 10 / 12 31 / 6 / 28 <nl> + f 33 / 11 / 11 35 / 13 / 24 36 / 12 / 23 34 / 10 / 12 <nl> + f 35 / 13 / 24 37 / 15 / 22 38 / 14 / 21 36 / 12 / 23 <nl> + f 37 / 15 / 22 39 / 17 / 29 40 / 16 / 30 38 / 14 / 21 <nl> + f 39 / 20 / 29 41 / 19 / 18 42 / 18 / 17 40 / 21 / 30 <nl> + f 41 / 19 / 18 43 / 23 / 16 44 / 22 / 15 42 / 18 / 17 <nl> + f 43 / 23 / 16 29 / 8 / 14 32 / 9 / 13 44 / 22 / 15 <nl> + f 29 / 24 / 14 45 / 26 / 31 30 / 25 / 27 <nl> + f 30 / 25 / 27 45 / 26 / 31 33 / 27 / 11 <nl> + f 33 / 27 / 11 45 / 26 / 31 35 / 28 / 24 <nl> + f 35 / 28 / 24 45 / 26 / 31 37 / 29 / 22 <nl> + f 37 / 29 / 22 45 / 26 / 31 39 / 30 / 29 <nl> + f 39 / 30 / 29 45 / 26 / 31 41 / 31 / 18 <nl> + f 41 / 31 / 18 45 / 26 / 31 43 / 32 / 16 <nl> + f 43 / 32 / 16 45 / 26 / 31 29 / 24 / 14 <nl> + f 34 / 33 / 12 46 / 35 / 32 31 / 34 / 28 <nl> + f 46 / 35 / 32 32 / 36 / 13 31 / 34 / 28 <nl> + f 40 / 37 / 30 42 / 38 / 17 46 / 35 / 32 <nl> + f 38 / 39 / 21 40 / 37 / 30 46 / 35 / 32 <nl> + f 34 / 33 / 12 36 / 40 / 23 46 / 35 / 32 <nl> + f 36 / 40 / 23 38 / 39 / 21 46 / 35 / 32 <nl> + f 42 / 38 / 17 44 / 41 / 15 46 / 35 / 32 <nl> + f 44 / 41 / 15 32 / 36 / 13 46 / 35 / 32 <nl> + f 10 / 42 / 8 47 / 43 / 33 48 / 44 / 34 9 / 45 / 7 <nl> + f 8 / 1 / 6 49 / 46 / 35 47 / 43 / 33 10 / 42 / 8 <nl> + f 50 / 47 / 36 51 / 48 / 37 52 / 49 / 38 53 / 50 / 39 <nl> + f 53 / 50 / 39 52 / 49 / 38 54 / 51 / 40 55 / 52 / 41 <nl> + f 8 / 1 / 6 7 / 2 / 5 55 / 52 / 41 <nl> + f 55 / 52 / 41 7 / 2 / 5 50 / 53 / 36 53 / 54 / 39 <nl> + f 56 / 55 / 42 57 / 56 / 43 58 / 57 / 44 59 / 58 / 45 <nl> + f 57 / 56 / 43 60 / 59 / 46 61 / 60 / 47 58 / 57 / 44 <nl> + f 60 / 59 / 46 62 / 61 / 48 63 / 62 / 49 61 / 60 / 47 <nl> + f 62 / 63 / 48 60 / 59 / 46 57 / 56 / 43 56 / 64 / 42 <nl> + f 59 / 65 / 45 58 / 57 / 44 61 / 60 / 47 63 / 66 / 49 <nl> + f 64 / 67 / 50 65 / 68 / 51 66 / 69 / 52 67 / 70 / 53 <nl> + f 65 / 68 / 51 68 / 71 / 54 69 / 72 / 55 66 / 69 / 52 <nl> + f 70 / 73 / 56 71 / 74 / 57 72 / 75 / 58 73 / 76 / 59 <nl> + f 74 / 77 / 60 75 / 78 / 61 76 / 79 / 62 77 / 80 / 63 <nl> + f 78 / 81 / 64 79 / 82 / 65 80 / 83 / 66 81 / 84 / 67 <nl> + f 79 / 82 / 65 82 / 85 / 68 83 / 86 / 69 80 / 83 / 66 <nl> + f 82 / 85 / 68 84 / 87 / 70 85 / 88 / 2 83 / 86 / 69 <nl> + f 84 / 87 / 70 86 / 89 / 71 87 / 90 / 72 85 / 88 / 2 <nl> + f 86 / 89 / 71 88 / 91 / 73 89 / 92 / 74 87 / 90 / 72 <nl> + f 88 / 93 / 73 90 / 94 / 75 91 / 95 / 76 89 / 96 / 74 <nl> + f 90 / 94 / 75 92 / 97 / 77 93 / 98 / 5 91 / 95 / 76 <nl> + f 92 / 97 / 77 78 / 81 / 64 81 / 84 / 67 93 / 98 / 5 <nl> + f 78 / 99 / 64 94 / 100 / 78 79 / 101 / 65 <nl> + f 79 / 101 / 65 94 / 100 / 78 82 / 102 / 68 <nl> + f 82 / 102 / 68 94 / 100 / 78 84 / 103 / 70 <nl> + f 84 / 103 / 70 94 / 100 / 78 86 / 104 / 71 <nl> + f 86 / 104 / 71 94 / 100 / 78 88 / 105 / 73 <nl> + f 88 / 105 / 73 94 / 100 / 78 90 / 106 / 75 <nl> + f 95 / 107 / 79 96 / 108 / 80 97 / 109 / 81 98 / 110 / 82 <nl> + f 95 / 107 / 79 98 / 110 / 82 99 / 111 / 83 100 / 112 / 84 <nl> + f 95 / 107 / 79 100 / 112 / 84 101 / 113 / 85 102 / 114 / 86 <nl> + f 102 / 114 / 86 103 / 115 / 87 95 / 107 / 79 <nl> + f 104 / 116 / 88 105 / 117 / 89 97 / 109 / 81 96 / 108 / 80 <nl> + f 106 / 118 / 90 98 / 110 / 82 97 / 109 / 81 105 / 119 / 89 <nl> + f 107 / 120 / 91 99 / 111 / 83 98 / 110 / 82 106 / 121 / 90 <nl> + f 108 / 122 / 92 109 / 123 / 93 110 / 124 / 94 111 / 125 / 95 <nl> + f 112 / 126 / 92 113 / 127 / 96 109 / 123 / 93 108 / 122 / 92 <nl> + f 114 / 128 / 97 115 / 129 / 98 116 / 130 / 99 103 / 115 / 87 <nl> + f 104 / 116 / 88 96 / 108 / 80 116 / 130 / 99 115 / 131 / 98 <nl> + f 101 / 113 / 85 117 / 132 / 100 118 / 133 / 101 102 / 114 / 86 <nl> + f 103 / 115 / 87 102 / 114 / 86 118 / 133 / 101 114 / 134 / 97 <nl> + f 111 / 135 / 95 110 / 124 / 94 99 / 111 / 83 107 / 120 / 91 <nl> + f 100 / 112 / 84 99 / 111 / 83 110 / 124 / 94 109 / 123 / 93 <nl> + f 100 / 112 / 84 109 / 123 / 93 113 / 127 / 96 101 / 113 / 85 <nl> + f 119 / 136 / 102 120 / 137 / 103 121 / 138 / 104 106 / 139 / 90 <nl> + f 119 / 136 / 102 106 / 139 / 90 111 / 140 / 95 122 / 141 / 105 <nl> + f 119 / 136 / 102 122 / 141 / 105 123 / 142 / 106 124 / 143 / 107 <nl> + f 124 / 143 / 107 125 / 144 / 108 120 / 137 / 103 119 / 136 / 102 <nl> + f 126 / 145 / 109 121 / 138 / 104 120 / 137 / 103 127 / 146 / 110 <nl> + f 128 / 147 / 111 106 / 139 / 90 121 / 138 / 104 126 / 148 / 109 <nl> + f 129 / 149 / 112 111 / 140 / 95 106 / 139 / 90 128 / 147 / 111 <nl> + f 130 / 150 / 92 122 / 141 / 105 111 / 140 / 95 129 / 149 / 112 <nl> + f 131 / 151 / 113 123 / 142 / 106 122 / 141 / 105 130 / 150 / 92 <nl> + f 127 / 146 / 110 120 / 137 / 103 125 / 144 / 108 132 / 152 / 114 <nl> + f 133 / 153 / 115 134 / 154 / 116 135 / 155 / 117 136 / 156 / 118 <nl> + f 134 / 154 / 116 127 / 157 / 110 132 / 158 / 114 135 / 155 / 117 <nl> + f 130 / 159 / 92 137 / 160 / 119 138 / 161 / 120 131 / 162 / 113 <nl> + f 139 / 163 / 121 140 / 164 / 122 141 / 165 / 123 142 / 166 / 124 <nl> + f 126 / 167 / 109 143 / 168 / 125 144 / 169 / 126 128 / 170 / 111 <nl> + f 141 / 165 / 123 143 / 171 / 125 145 / 172 / 127 133 / 173 / 115 <nl> + f 130 / 159 / 92 129 / 174 / 112 146 / 175 / 128 137 / 160 / 119 <nl> + f 134 / 154 / 116 133 / 153 / 115 145 / 176 / 127 147 / 177 / 129 <nl> + f 137 / 160 / 119 140 / 164 / 122 139 / 163 / 121 138 / 161 / 120 <nl> + f 140 / 164 / 122 137 / 160 / 119 146 / 175 / 128 144 / 178 / 126 <nl> + f 144 / 169 / 126 146 / 179 / 128 129 / 180 / 112 128 / 170 / 111 <nl> + f 143 / 168 / 125 126 / 167 / 109 147 / 177 / 129 145 / 181 / 127 <nl> + f 148 / 182 / 130 149 / 183 / 131 150 / 184 / 132 151 / 185 / 133 <nl> + f 151 / 186 / 133 150 / 187 / 132 152 / 188 / 134 153 / 189 / 135 <nl> + f 154 / 190 / 136 155 / 191 / 137 156 / 192 / 138 157 / 193 / 139 <nl> + f 158 / 194 / 140 149 / 183 / 131 148 / 182 / 130 159 / 195 / 141 <nl> + f 148 / 182 / 130 151 / 196 / 133 153 / 197 / 135 159 / 195 / 141 <nl> + f 155 / 191 / 137 149 / 183 / 131 158 / 194 / 140 156 / 192 / 138 <nl> + f 154 / 198 / 136 157 / 199 / 139 152 / 188 / 134 150 / 187 / 132 <nl> + f 155 / 191 / 137 154 / 200 / 136 150 / 184 / 132 149 / 183 / 131 <nl> + f 160 / 201 / 142 161 / 202 / 61 162 / 203 / 56 163 / 204 / 143 <nl> + f 161 / 202 / 61 164 / 205 / 144 165 / 206 / 67 162 / 203 / 56 <nl> + f 166 / 207 / 145 167 / 208 / 146 168 / 209 / 147 169 / 210 / 57 <nl> + f 170 / 211 / 148 160 / 212 / 142 163 / 213 / 143 171 / 214 / 76 <nl> + f 170 / 215 / 148 164 / 205 / 144 161 / 202 / 61 160 / 216 / 142 <nl> + f 163 / 217 / 143 162 / 203 / 56 165 / 206 / 67 171 / 218 / 76 <nl> + f 165 / 206 / 67 164 / 205 / 144 166 / 207 / 145 169 / 210 / 57 <nl> + f 170 / 215 / 148 167 / 219 / 146 166 / 207 / 145 164 / 205 / 144 <nl> + f 171 / 214 / 76 168 / 220 / 147 167 / 221 / 146 170 / 211 / 148 <nl> + f 165 / 206 / 67 169 / 210 / 57 168 / 222 / 147 171 / 218 / 76 <nl> + f 172 / 223 / 149 173 / 224 / 150 174 / 225 / 151 175 / 226 / 152 <nl> + f 172 / 223 / 149 175 / 226 / 152 176 / 227 / 153 177 / 228 / 154 <nl> + f 174 / 225 / 151 173 / 229 / 150 178 / 230 / 155 179 / 231 / 156 <nl> + f 90 / 106 / 75 94 / 100 / 78 92 / 232 / 77 <nl> + f 92 / 232 / 77 94 / 100 / 78 78 / 99 / 64 <nl> + f 180 / 233 / 64 181 / 234 / 65 182 / 235 / 66 183 / 236 / 67 <nl> + f 181 / 234 / 65 184 / 237 / 68 185 / 238 / 69 182 / 235 / 66 <nl> + f 184 / 237 / 68 186 / 239 / 70 187 / 240 / 2 185 / 238 / 69 <nl> + f 186 / 239 / 70 188 / 241 / 71 189 / 242 / 72 187 / 240 / 2 <nl> + f 188 / 241 / 71 190 / 243 / 73 191 / 244 / 74 189 / 242 / 72 <nl> + f 190 / 245 / 73 192 / 246 / 75 193 / 247 / 76 191 / 248 / 74 <nl> + f 192 / 246 / 75 194 / 249 / 77 195 / 250 / 5 193 / 247 / 76 <nl> + f 194 / 249 / 77 180 / 233 / 64 183 / 236 / 67 195 / 250 / 5 <nl> + f 180 / 251 / 64 196 / 252 / 78 181 / 253 / 65 <nl> + f 181 / 253 / 65 196 / 252 / 78 184 / 254 / 68 <nl> + f 184 / 254 / 68 196 / 252 / 78 186 / 255 / 70 <nl> + f 186 / 255 / 70 196 / 252 / 78 188 / 256 / 71 <nl> + f 188 / 256 / 71 196 / 252 / 78 190 / 257 / 73 <nl> + f 190 / 257 / 73 196 / 252 / 78 192 / 258 / 75 <nl> + f 192 / 258 / 75 196 / 252 / 78 194 / 259 / 77 <nl> + f 194 / 259 / 77 196 / 252 / 78 180 / 251 / 64 <nl> + f 74 / 77 / 60 71 / 74 / 57 70 / 73 / 56 75 / 78 / 61 <nl> + f 197 / 260 / 157 198 / 261 / 158 199 / 262 / 159 200 / 263 / 160 <nl> + f 201 / 264 / 161 200 / 263 / 160 199 / 262 / 159 202 / 265 / 162 <nl> + f 203 / 266 / 163 201 / 264 / 161 202 / 265 / 162 204 / 267 / 164 <nl> + f 198 / 268 / 158 197 / 269 / 157 203 / 270 / 163 204 / 271 / 164 <nl> + f 200 / 263 / 160 201 / 264 / 161 203 / 272 / 163 197 / 273 / 157 <nl> + f 205 / 274 / 165 206 / 275 / 166 207 / 276 / 167 208 / 277 / 168 <nl> + f 209 / 278 / 92 210 / 279 / 169 211 / 280 / 170 212 / 281 / 171 <nl> + f 210 / 282 / 169 208 / 283 / 168 207 / 284 / 167 211 / 285 / 170 <nl> + f 213 / 286 / 172 214 / 287 / 173 215 / 288 / 174 216 / 289 / 175 <nl> + f 217 / 177 / 176 218 / 154 / 177 219 / 157 / 178 220 / 167 / 179 <nl> + f 136 / 290 / 118 221 / 173 / 180 222 / 165 / 181 142 / 166 / 124 <nl> + f 223 / 171 / 182 224 / 178 / 183 225 / 164 / 184 222 / 165 / 181 <nl> + f 226 / 227 / 185 227 / 291 / 186 228 / 292 / 78 229 / 293 / 187 <nl> + f 230 / 294 / 188 231 / 295 / 189 232 / 296 / 190 233 / 297 / 191 <nl> + f 231 / 295 / 189 234 / 298 / 192 235 / 299 / 193 232 / 296 / 190 <nl> + f 234 / 298 / 192 236 / 300 / 194 237 / 301 / 195 235 / 299 / 193 <nl> + f 237 / 302 / 195 236 / 303 / 194 230 / 304 / 188 233 / 305 / 191 <nl> + f 236 / 306 / 194 234 / 298 / 192 231 / 295 / 189 230 / 307 / 188 <nl> + f 238 / 308 / 196 239 / 226 / 197 226 / 227 / 185 229 / 293 / 187 <nl> + f 240 / 225 / 198 239 / 226 / 197 238 / 308 / 196 241 / 309 / 66 <nl> + f 242 / 231 / 199 240 / 225 / 198 241 / 309 / 66 243 / 310 / 200 <nl> + f 244 / 311 / 201 242 / 231 / 199 243 / 310 / 200 131 / 312 / 113 <nl> + f 245 / 194 / 202 246 / 192 / 203 247 / 313 / 204 248 / 314 / 205 <nl> + f 249 / 195 / 206 245 / 194 / 202 248 / 314 / 205 250 / 315 / 207 <nl> + f 251 / 197 / 208 249 / 195 / 206 250 / 315 / 207 252 / 316 / 209 <nl> + f 253 / 317 / 210 254 / 188 / 211 251 / 189 / 208 252 / 318 / 209 <nl> + f 255 / 199 / 212 254 / 188 / 211 253 / 317 / 210 256 / 319 / 213 <nl> + f 246 / 192 / 203 255 / 193 / 212 256 / 320 / 213 247 / 313 / 204 <nl> + f 206 / 275 / 166 213 / 286 / 172 216 / 321 / 175 207 / 276 / 167 <nl> + f 212 / 281 / 171 214 / 287 / 173 213 / 286 / 172 206 / 275 / 166 <nl> + f 215 / 322 / 174 214 / 287 / 173 212 / 281 / 171 211 / 280 / 170 <nl> + f 77 / 323 / 63 72 / 324 / 58 71 / 74 / 57 74 / 77 / 60 <nl> + f 216 / 325 / 175 215 / 326 / 174 211 / 285 / 170 207 / 284 / 167 <nl> + f 55 / 52 / 41 54 / 51 / 40 49 / 46 / 35 8 / 1 / 6 <nl> + f 257 / 327 / 92 258 / 328 / 214 259 / 329 / 215 260 / 330 / 63 <nl> + f 261 / 331 / 58 262 / 332 / 216 258 / 333 / 214 257 / 334 / 92 <nl> + f 263 / 335 / 5 264 / 336 / 217 262 / 332 / 216 261 / 331 / 58 <nl> + f 265 / 337 / 59 266 / 338 / 218 264 / 336 / 217 263 / 335 / 5 <nl> + f 267 / 339 / 165 268 / 340 / 219 266 / 338 / 218 265 / 337 / 59 <nl> + f 269 / 341 / 62 270 / 342 / 220 268 / 340 / 219 267 / 339 / 165 <nl> + f 271 / 343 / 2 272 / 344 / 221 270 / 342 / 220 269 / 341 / 62 <nl> + f 260 / 330 / 63 259 / 329 / 215 272 / 344 / 221 271 / 343 / 2 <nl> + f 259 / 345 / 215 258 / 346 / 214 273 / 347 / 66 <nl> + f 258 / 346 / 214 262 / 348 / 216 273 / 347 / 66 <nl> + f 262 / 348 / 216 264 / 349 / 217 273 / 347 / 66 <nl> + f 264 / 349 / 217 266 / 350 / 218 273 / 347 / 66 <nl> + f 266 / 350 / 218 268 / 351 / 219 273 / 347 / 66 <nl> + f 268 / 351 / 219 270 / 352 / 220 273 / 347 / 66 <nl> + f 270 / 352 / 220 272 / 353 / 221 273 / 347 / 66 <nl> + f 272 / 353 / 221 259 / 345 / 215 273 / 347 / 66 <nl> + f 274 / 354 / 62 275 / 73 / 61 276 / 78 / 56 277 / 355 / 59 <nl> + f 275 / 73 / 61 278 / 74 / 60 279 / 77 / 57 276 / 78 / 56 <nl> + f 278 / 74 / 60 280 / 324 / 63 281 / 323 / 58 279 / 77 / 57 <nl> + f 280 / 75 / 63 278 / 74 / 60 275 / 73 / 61 274 / 76 / 62 <nl> + f 277 / 79 / 59 276 / 78 / 56 279 / 77 / 57 281 / 80 / 58 <nl> + f 282 / 83 / 222 283 / 82 / 223 284 / 81 / 68 285 / 84 / 69 <nl> + f 286 / 86 / 67 287 / 85 / 64 283 / 82 / 223 282 / 83 / 222 <nl> + f 288 / 88 / 5 289 / 87 / 77 287 / 85 / 64 286 / 86 / 67 <nl> + f 290 / 90 / 76 291 / 89 / 75 289 / 87 / 77 288 / 88 / 5 <nl> + f 292 / 92 / 224 293 / 91 / 225 291 / 89 / 75 290 / 90 / 76 <nl> + f 294 / 95 / 72 295 / 94 / 71 293 / 93 / 225 292 / 96 / 224 <nl> + f 296 / 98 / 2 297 / 97 / 70 295 / 94 / 71 294 / 95 / 72 <nl> + f 285 / 84 / 69 284 / 81 / 68 297 / 97 / 70 296 / 98 / 2 <nl> + f 284 / 99 / 68 283 / 101 / 223 298 / 100 / 78 <nl> + f 283 / 101 / 223 287 / 102 / 64 298 / 100 / 78 <nl> + f 287 / 102 / 64 289 / 103 / 77 298 / 100 / 78 <nl> + f 289 / 103 / 77 291 / 104 / 75 298 / 100 / 78 <nl> + f 291 / 104 / 75 293 / 105 / 225 298 / 100 / 78 <nl> + f 293 / 105 / 225 295 / 106 / 71 298 / 100 / 78 <nl> + f 295 / 106 / 71 297 / 232 / 70 298 / 100 / 78 <nl> + f 297 / 232 / 70 284 / 99 / 68 298 / 100 / 78 <nl> + f 299 / 235 / 222 300 / 234 / 223 301 / 233 / 68 302 / 236 / 69 <nl> + f 303 / 238 / 67 304 / 237 / 64 300 / 234 / 223 299 / 235 / 222 <nl> + f 305 / 240 / 5 306 / 239 / 77 304 / 237 / 64 303 / 238 / 67 <nl> + f 307 / 242 / 76 308 / 241 / 75 306 / 239 / 77 305 / 240 / 5 <nl> + f 309 / 244 / 224 310 / 243 / 225 308 / 241 / 75 307 / 242 / 76 <nl> + f 311 / 247 / 72 312 / 246 / 71 310 / 245 / 225 309 / 248 / 224 <nl> + f 313 / 250 / 2 314 / 249 / 70 312 / 246 / 71 311 / 247 / 72 <nl> + f 302 / 236 / 69 301 / 233 / 68 314 / 249 / 70 313 / 250 / 2 <nl> + f 301 / 251 / 68 300 / 253 / 223 315 / 252 / 78 <nl> + f 300 / 253 / 223 304 / 254 / 64 315 / 252 / 78 <nl> + f 304 / 254 / 64 306 / 255 / 77 315 / 252 / 78 <nl> + f 306 / 255 / 77 308 / 256 / 75 315 / 252 / 78 <nl> + f 308 / 256 / 75 310 / 257 / 225 315 / 252 / 78 <nl> + f 310 / 257 / 225 312 / 258 / 71 315 / 252 / 78 <nl> + f 312 / 258 / 71 314 / 259 / 70 315 / 252 / 78 <nl> + f 314 / 259 / 70 301 / 251 / 68 315 / 252 / 78 <nl> + f 199 / 262 / 159 198 / 261 / 158 316 / 260 / 226 317 / 263 / 227 <nl> + f 199 / 262 / 159 317 / 263 / 227 318 / 264 / 228 202 / 265 / 162 <nl> + f 202 / 265 / 162 318 / 264 / 228 319 / 266 / 229 204 / 267 / 164 <nl> + f 198 / 268 / 158 204 / 271 / 164 319 / 270 / 229 316 / 269 / 226 <nl> + f 319 / 272 / 229 318 / 264 / 228 317 / 263 / 227 316 / 273 / 226 <nl> + f 320 / 276 / 230 321 / 275 / 231 205 / 274 / 165 208 / 277 / 168 <nl> + f 209 / 278 / 92 322 / 281 / 232 323 / 280 / 233 210 / 279 / 169 <nl> + f 210 / 282 / 169 323 / 285 / 233 320 / 284 / 230 208 / 283 / 168 <nl> + f 324 / 288 / 234 325 / 287 / 235 326 / 286 / 236 327 / 289 / 237 <nl> + f 127 / 157 / 110 134 / 154 / 116 147 / 177 / 129 126 / 167 / 109 <nl> + f 141 / 165 / 123 133 / 173 / 115 136 / 290 / 118 142 / 166 / 124 <nl> + f 143 / 171 / 125 141 / 165 / 123 140 / 164 / 122 144 / 178 / 126 <nl> + f 228 / 292 / 78 177 / 291 / 154 176 / 227 / 153 229 / 293 / 187 <nl> + f 238 / 308 / 196 229 / 293 / 187 176 / 227 / 153 175 / 226 / 152 <nl> + f 238 / 308 / 196 175 / 226 / 152 174 / 225 / 151 241 / 309 / 66 <nl> + f 241 / 309 / 66 174 / 225 / 151 179 / 231 / 156 243 / 310 / 200 <nl> + f 243 / 310 / 200 179 / 231 / 156 178 / 311 / 155 131 / 312 / 113 <nl> + f 247 / 313 / 204 156 / 192 / 138 158 / 194 / 140 248 / 314 / 205 <nl> + f 248 / 314 / 205 158 / 194 / 140 159 / 195 / 141 250 / 315 / 207 <nl> + f 250 / 315 / 207 159 / 195 / 141 153 / 197 / 135 252 / 316 / 209 <nl> + f 253 / 317 / 210 252 / 318 / 209 153 / 189 / 135 152 / 188 / 134 <nl> + f 253 / 317 / 210 152 / 188 / 134 157 / 199 / 139 256 / 319 / 213 <nl> + f 256 / 320 / 213 157 / 193 / 139 156 / 192 / 138 247 / 313 / 204 <nl> + f 327 / 321 / 237 326 / 286 / 236 321 / 275 / 231 320 / 276 / 230 <nl> + f 322 / 281 / 232 321 / 275 / 231 326 / 286 / 236 325 / 287 / 235 <nl> + f 322 / 281 / 232 325 / 287 / 235 324 / 322 / 234 323 / 280 / 233 <nl> + f 323 / 285 / 233 324 / 326 / 234 327 / 325 / 237 320 / 284 / 230 <nl> + f 49 / 46 / 35 54 / 51 / 40 328 / 52 / 238 1 / 1 / 1 <nl> + f 48 / 44 / 34 47 / 43 / 33 5 / 42 / 4 4 / 45 / 3 <nl> + f 47 / 43 / 33 49 / 46 / 35 1 / 1 / 1 5 / 42 / 4 <nl> + f 52 / 49 / 38 51 / 48 / 37 329 / 47 / 239 330 / 50 / 240 <nl> + f 54 / 51 / 40 52 / 49 / 38 330 / 50 / 240 328 / 52 / 238 <nl> + f 1 / 1 / 1 328 / 52 / 238 2 / 2 / 2 <nl> + f 328 / 52 / 238 330 / 54 / 240 329 / 53 / 239 2 / 2 / 2 <nl> + f 331 / 107 / 241 332 / 110 / 242 333 / 109 / 243 334 / 108 / 244 <nl> + f 335 / 111 / 245 332 / 110 / 242 331 / 107 / 241 336 / 112 / 246 <nl> + f 337 / 113 / 247 336 / 112 / 246 331 / 107 / 241 338 / 114 / 248 <nl> + f 339 / 115 / 249 331 / 107 / 241 334 / 108 / 244 340 / 130 / 250 <nl> + f 341 / 116 / 251 334 / 108 / 244 333 / 109 / 243 342 / 117 / 252 <nl> + f 333 / 109 / 243 332 / 110 / 242 343 / 118 / 253 342 / 119 / 252 <nl> + f 332 / 110 / 242 335 / 111 / 245 344 / 120 / 254 343 / 121 / 253 <nl> + f 345 / 124 / 255 346 / 123 / 256 347 / 122 / 257 348 / 125 / 258 <nl> + f 346 / 123 / 256 349 / 127 / 259 350 / 126 / 257 347 / 122 / 257 <nl> + f 351 / 128 / 260 339 / 115 / 249 340 / 130 / 250 352 / 129 / 261 <nl> + f 340 / 130 / 250 334 / 108 / 244 341 / 116 / 251 352 / 131 / 261 <nl> + f 353 / 133 / 262 354 / 132 / 263 337 / 113 / 247 338 / 114 / 248 <nl> + f 339 / 115 / 249 351 / 134 / 260 353 / 133 / 262 338 / 114 / 248 <nl> + f 335 / 111 / 245 345 / 124 / 255 348 / 135 / 258 344 / 120 / 254 <nl> + f 345 / 124 / 255 335 / 111 / 245 336 / 112 / 246 346 / 123 / 256 <nl> + f 349 / 127 / 259 346 / 123 / 256 336 / 112 / 246 337 / 113 / 247 <nl> + f 355 / 136 / 264 343 / 139 / 253 356 / 138 / 265 357 / 137 / 266 <nl> + f 348 / 140 / 258 343 / 139 / 253 355 / 136 / 264 358 / 141 / 267 <nl> + f 123 / 142 / 106 358 / 141 / 267 355 / 136 / 264 124 / 143 / 107 <nl> + f 124 / 143 / 107 355 / 136 / 264 357 / 137 / 266 125 / 144 / 108 <nl> + f 357 / 137 / 266 356 / 138 / 265 220 / 145 / 179 219 / 146 / 178 <nl> + f 356 / 138 / 265 343 / 139 / 253 359 / 147 / 268 220 / 148 / 179 <nl> + f 343 / 139 / 253 348 / 140 / 258 360 / 149 / 269 359 / 147 / 268 <nl> + f 348 / 140 / 258 358 / 141 / 267 361 / 150 / 92 360 / 149 / 269 <nl> + f 358 / 141 / 267 123 / 142 / 106 131 / 151 / 113 361 / 150 / 92 <nl> + f 125 / 144 / 108 357 / 137 / 266 219 / 146 / 178 132 / 152 / 114 <nl> + f 135 / 155 / 117 218 / 154 / 177 221 / 153 / 180 136 / 156 / 118 <nl> + f 132 / 158 / 114 219 / 157 / 178 218 / 154 / 177 135 / 155 / 117 <nl> + f 138 / 161 / 120 362 / 160 / 270 361 / 159 / 92 131 / 162 / 113 <nl> + f 139 / 163 / 121 142 / 166 / 124 222 / 165 / 181 225 / 164 / 184 <nl> + f 220 / 167 / 179 359 / 170 / 268 224 / 169 / 183 223 / 168 / 182 <nl> + f 363 / 172 / 271 223 / 171 / 182 222 / 165 / 181 221 / 173 / 180 <nl> + f 364 / 175 / 272 360 / 174 / 269 361 / 159 / 92 362 / 160 / 270 <nl> + f 218 / 154 / 177 217 / 177 / 176 363 / 176 / 271 221 / 153 / 180 <nl> + f 139 / 163 / 121 225 / 164 / 184 362 / 160 / 270 138 / 161 / 120 <nl> + f 364 / 175 / 272 362 / 160 / 270 225 / 164 / 184 224 / 178 / 183 <nl> + f 360 / 180 / 269 364 / 179 / 272 224 / 169 / 183 359 / 170 / 268 <nl> + f 217 / 177 / 176 220 / 167 / 179 223 / 168 / 182 363 / 181 / 271 <nl> + f 365 / 184 / 273 366 / 183 / 274 367 / 182 / 275 368 / 185 / 276 <nl> + f 254 / 188 / 211 365 / 187 / 273 368 / 186 / 276 251 / 189 / 208 <nl> + f 246 / 192 / 203 369 / 191 / 277 370 / 190 / 278 255 / 193 / 212 <nl> + f 245 / 194 / 202 249 / 195 / 206 367 / 182 / 275 366 / 183 / 274 <nl> + f 251 / 197 / 208 368 / 196 / 276 367 / 182 / 275 249 / 195 / 206 <nl> + f 245 / 194 / 202 366 / 183 / 274 369 / 191 / 277 246 / 192 / 203 <nl> + f 254 / 188 / 211 255 / 199 / 212 370 / 198 / 278 365 / 187 / 273 <nl> + f 365 / 184 / 273 370 / 200 / 278 369 / 191 / 277 366 / 183 / 274 <nl> + f 371 / 203 / 61 372 / 202 / 56 373 / 201 / 143 374 / 204 / 142 <nl> + f 375 / 206 / 69 376 / 205 / 279 372 / 202 / 56 371 / 203 / 61 <nl> + f 377 / 209 / 280 378 / 208 / 281 379 / 207 / 282 380 / 210 / 60 <nl> + f 374 / 213 / 142 373 / 212 / 143 381 / 211 / 283 382 / 214 / 72 <nl> + f 372 / 202 / 56 376 / 205 / 279 381 / 215 / 283 373 / 216 / 143 <nl> + f 375 / 206 / 69 371 / 203 / 61 374 / 217 / 142 382 / 218 / 72 <nl> + f 375 / 206 / 69 380 / 210 / 60 379 / 207 / 282 376 / 205 / 279 <nl> + f 379 / 207 / 282 378 / 219 / 281 381 / 215 / 283 376 / 205 / 279 <nl> + f 378 / 221 / 281 377 / 220 / 280 382 / 214 / 72 381 / 211 / 283 <nl> + f 377 / 222 / 280 380 / 210 / 60 375 / 206 / 69 382 / 218 / 72 <nl> + f 240 / 225 / 198 383 / 224 / 284 384 / 223 / 285 239 / 226 / 197 <nl> + f 226 / 227 / 185 239 / 226 / 197 384 / 223 / 285 227 / 228 / 186 <nl> + f 244 / 230 / 201 383 / 229 / 284 240 / 225 / 198 242 / 231 / 199 <nl> + f 68 / 71 / 54 385 / 356 / 286 386 / 357 / 287 69 / 72 / 55 <nl> + f 385 / 356 / 286 387 / 358 / 288 388 / 359 / 289 386 / 357 / 287 <nl> + f 387 / 358 / 288 389 / 360 / 290 390 / 361 / 291 388 / 359 / 289 <nl> + f 389 / 360 / 290 391 / 362 / 292 392 / 363 / 293 390 / 361 / 291 <nl> + f 391 / 362 / 292 393 / 364 / 294 394 / 365 / 295 392 / 363 / 293 <nl> + f 393 / 364 / 294 64 / 366 / 50 67 / 367 / 53 394 / 365 / 295 <nl> + f 395 / 368 / 296 396 / 369 / 297 397 / 370 / 298 <nl> + f 397 / 370 / 298 396 / 369 / 297 398 / 371 / 299 <nl> + f 398 / 371 / 299 396 / 369 / 297 399 / 372 / 300 <nl> + f 399 / 372 / 300 396 / 369 / 297 400 / 373 / 301 <nl> + f 400 / 373 / 301 396 / 369 / 297 401 / 374 / 302 <nl> + f 401 / 374 / 302 396 / 369 / 297 402 / 375 / 303 <nl> + f 402 / 375 / 303 396 / 369 / 297 403 / 376 / 304 <nl> + f 395 / 368 / 296 403 / 376 / 304 396 / 369 / 297 <nl> + f 404 / 377 / 305 405 / 378 / 306 406 / 379 / 307 <nl> + f 404 / 377 / 305 406 / 379 / 307 407 / 380 / 308 <nl> + f 404 / 377 / 305 407 / 380 / 308 408 / 381 / 309 <nl> + f 404 / 377 / 305 408 / 381 / 309 409 / 382 / 310 <nl> + f 404 / 377 / 305 409 / 382 / 310 410 / 383 / 311 <nl> + f 404 / 377 / 305 410 / 383 / 311 411 / 384 / 312 <nl> + f 404 / 377 / 305 411 / 384 / 312 412 / 385 / 313 <nl> + f 404 / 377 / 305 412 / 385 / 313 405 / 378 / 306 <nl> + f 64 / 386 / 50 393 / 387 / 294 403 / 376 / 304 395 / 368 / 296 <nl> + f 397 / 370 / 298 65 / 388 / 51 64 / 386 / 50 395 / 368 / 296 <nl> + f 398 / 371 / 299 68 / 389 / 54 65 / 388 / 51 397 / 370 / 298 <nl> + f 399 / 372 / 300 385 / 390 / 286 68 / 389 / 54 398 / 371 / 299 <nl> + f 400 / 373 / 301 387 / 391 / 288 385 / 390 / 286 399 / 372 / 300 <nl> + f 401 / 374 / 302 389 / 392 / 290 387 / 391 / 288 400 / 373 / 301 <nl> + f 402 / 375 / 303 391 / 393 / 292 389 / 392 / 290 401 / 374 / 302 <nl> + f 403 / 376 / 304 393 / 387 / 294 391 / 393 / 292 402 / 375 / 303 <nl> + f 67 / 394 / 53 66 / 395 / 52 413 / 396 / 314 414 / 397 / 315 <nl> + f 66 / 395 / 52 69 / 398 / 55 415 / 399 / 316 413 / 396 / 314 <nl> + f 416 / 296 / 317 417 / 295 / 318 418 / 294 / 319 419 / 297 / 320 <nl> + f 420 / 299 / 321 421 / 298 / 322 417 / 295 / 318 416 / 296 / 317 <nl> + f 422 / 301 / 323 423 / 300 / 324 421 / 298 / 322 420 / 299 / 321 <nl> + f 422 / 302 / 323 419 / 305 / 320 418 / 304 / 319 423 / 303 / 324 <nl> + f 417 / 295 / 318 421 / 298 / 322 423 / 306 / 324 418 / 307 / 319 <nl> + f 69 / 398 / 55 386 / 400 / 287 424 / 401 / 325 415 / 399 / 316 <nl> + f 386 / 400 / 287 388 / 402 / 289 425 / 403 / 326 424 / 401 / 325 <nl> + f 388 / 402 / 289 390 / 404 / 291 426 / 405 / 327 425 / 403 / 326 <nl> + f 390 / 404 / 291 392 / 406 / 293 427 / 407 / 328 426 / 405 / 327 <nl> + f 392 / 406 / 293 394 / 408 / 295 428 / 409 / 329 427 / 407 / 328 <nl> + f 394 / 408 / 295 67 / 394 / 53 414 / 397 / 315 428 / 409 / 329 <nl> + f 414 / 397 / 315 413 / 396 / 314 406 / 379 / 307 405 / 378 / 306 <nl> + f 413 / 396 / 314 415 / 399 / 316 407 / 380 / 308 406 / 379 / 307 <nl> + f 415 / 399 / 316 424 / 401 / 325 408 / 381 / 309 407 / 380 / 308 <nl> + f 424 / 401 / 325 425 / 403 / 326 409 / 382 / 310 408 / 381 / 309 <nl> + f 425 / 403 / 326 426 / 405 / 327 410 / 383 / 311 409 / 382 / 310 <nl> + f 426 / 405 / 327 427 / 407 / 328 411 / 384 / 312 410 / 383 / 311 <nl> + f 427 / 407 / 328 428 / 409 / 329 412 / 385 / 313 411 / 384 / 312 <nl> + f 412 / 385 / 313 428 / 409 / 329 414 / 397 / 315 405 / 378 / 306 <nl> + f 103 / 115 / 87 116 / 130 / 99 96 / 108 / 80 95 / 107 / 79 <nl> + f 338 / 114 / 248 331 / 107 / 241 339 / 115 / 249 <nl> + f 429 / 329 / 216 430 / 328 / 330 431 / 327 / 257 432 / 330 / 58 <nl> + f 430 / 333 / 330 433 / 332 / 215 434 / 331 / 63 431 / 334 / 257 <nl> + f 433 / 332 / 215 435 / 336 / 221 436 / 335 / 2 434 / 331 / 63 <nl> + f 435 / 336 / 221 437 / 338 / 220 438 / 337 / 62 436 / 335 / 2 <nl> + f 437 / 338 / 220 439 / 340 / 331 440 / 339 / 78 438 / 337 / 62 <nl> + f 439 / 340 / 331 441 / 342 / 218 442 / 341 / 59 440 / 339 / 78 <nl> + f 441 / 342 / 218 443 / 344 / 217 444 / 343 / 5 442 / 341 / 59 <nl> + f 443 / 344 / 217 429 / 329 / 216 432 / 330 / 58 444 / 343 / 5 <nl> + f 429 / 345 / 216 445 / 347 / 66 430 / 346 / 330 <nl> + f 430 / 346 / 330 445 / 347 / 66 433 / 348 / 215 <nl> + f 433 / 348 / 215 445 / 347 / 66 435 / 349 / 221 <nl> + f 435 / 349 / 221 445 / 347 / 66 437 / 350 / 220 <nl> + f 437 / 350 / 220 445 / 347 / 66 439 / 351 / 331 <nl> + f 439 / 351 / 331 445 / 347 / 66 441 / 352 / 218 <nl> + f 441 / 352 / 218 445 / 347 / 66 443 / 353 / 217 <nl> + f 443 / 353 / 217 445 / 347 / 66 429 / 345 / 216 <nl> + f 75 / 78 / 61 70 / 73 / 56 73 / 354 / 59 76 / 355 / 62 <nl> + # 307 polygons - 102 triangles <nl> + <nl> mmm a / tests / cpp - tests / proj . win32 / cpp - tests . vcxproj <nl> ppp b / tests / cpp - tests / proj . win32 / cpp - tests . vcxproj <nl> xcopy / Y / Q " $ ( ProjectDir ) . . \ . . \ . . \ external \ websockets \ prebuilt \ win32 \ * . * " " $ ( Ou <nl> < ClCompile Include = " . . \ Classes \ ReleasePoolTest \ ReleasePoolTest . cpp " / > <nl> < ClCompile Include = " . . \ Classes \ ShaderTest \ ShaderTest2 . cpp " / > <nl> < ClCompile Include = " . . \ Classes \ SpineTest \ SpineTest . cpp " / > <nl> + < ClCompile Include = " . . \ Classes \ Sprite3DTest \ Sprite3DTest . cpp " / > <nl> < ClCompile Include = " . . \ Classes \ TexturePackerEncryptionTest \ TextureAtlasEncryptionTest . cpp " / > <nl> < ClCompile Include = " . . \ Classes \ UITest \ CocoStudioGUITest \ CocosGUIScene . cpp " / > <nl> < ClCompile Include = " . . \ Classes \ UITest \ CocoStudioGUITest \ CocoStudioGUITest . cpp " / > <nl> xcopy / Y / Q " $ ( ProjectDir ) . . \ . . \ . . \ external \ websockets \ prebuilt \ win32 \ * . * " " $ ( Ou <nl> < ClInclude Include = " . . \ Classes \ ReleasePoolTest \ ReleasePoolTest . h " / > <nl> < ClInclude Include = " . . \ Classes \ ShaderTest \ ShaderTest2 . h " / > <nl> < ClInclude Include = " . . \ Classes \ SpineTest \ SpineTest . h " / > <nl> + < ClInclude Include = " . . \ Classes \ Sprite3DTest \ Sprite3DTest . h " / > <nl> < ClInclude Include = " . . \ Classes \ TexturePackerEncryptionTest \ TextureAtlasEncryptionTest . h " / > <nl> < ClInclude Include = " . . \ Classes \ UITest \ CocoStudioGUITest \ CocosGUIScene . h " / > <nl> < ClInclude Include = " . . \ Classes \ UITest \ CocoStudioGUITest \ CocoStudioGUITest . h " / > <nl> mmm a / tests / cpp - tests / proj . win32 / cpp - tests . vcxproj . filters <nl> ppp b / tests / cpp - tests / proj . win32 / cpp - tests . vcxproj . filters <nl> <nl> < Filter Include = " Classes \ UITest \ CocostudioGUISceneTest \ UIWidgetAddNodeTest " > <nl> < UniqueIdentifier > { 5bde63be - bdba - 4155 - a3a9 - 72f06c169768 } < / UniqueIdentifier > <nl> < / Filter > <nl> + < Filter Include = " Classes \ Sprite3DTest " > <nl> + < UniqueIdentifier > { 45e9becf - 58e5 - 424e - 903d - 9bc7f9999d5b } < / UniqueIdentifier > <nl> + < / Filter > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClCompile Include = " main . cpp " > <nl> <nl> < ClCompile Include = " . . \ Classes \ BugsTest \ Bug - Child . cpp " > <nl> < Filter > Classes \ BugsTest < / Filter > <nl> < / ClCompile > <nl> + < ClCompile Include = " . . \ Classes \ Sprite3DTest \ Sprite3DTest . cpp " > <nl> + < Filter > Classes \ Sprite3DTest < / Filter > <nl> + < / ClCompile > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClInclude Include = " main . h " > <nl> <nl> < ClInclude Include = " . . \ Classes \ BugsTest \ Bug - Child . h " > <nl> < Filter > Classes \ BugsTest < / Filter > <nl> < / ClInclude > <nl> + < ClInclude Include = " . . \ Classes \ Sprite3DTest \ Sprite3DTest . h " > <nl> + < Filter > Classes \ Sprite3DTest < / Filter > <nl> + < / ClInclude > <nl> < / ItemGroup > <nl> < / Project > <nl> \ No newline at end of file <nl> mmm a / tests / cpp - tests / proj . wp8 - xaml / cpp - tests / cpp - tests . csproj <nl> ppp b / tests / cpp - tests / proj . wp8 - xaml / cpp - tests / cpp - tests . csproj <nl> <nl> < WarningLevel > 4 < / WarningLevel > <nl> < / PropertyGroup > <nl> < ItemGroup > <nl> - < Compile Include = " App . xaml . cs " / > <nl> - < Compile Include = " EditBox . xaml . cs " / > <nl> + < Compile Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ App . xaml . cs " > <nl> + < Link > App . xaml . cs < / Link > <nl> + < / Compile > <nl> + < Compile Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ EditBox . xaml . cs " > <nl> + < Link > EditBox . xaml . cs < / Link > <nl> + < / Compile > <nl> + < Compile Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ MainPage . xaml . cs " > <nl> + < Link > MainPage . xaml . cs < / Link > <nl> + < / Compile > <nl> < Compile Include = " LocalizedStrings . cs " / > <nl> - < Compile Include = " MainPage . xaml . cs " / > <nl> < Compile Include = " Properties \ AssemblyInfo . cs " / > <nl> < Compile Include = " Resources \ AppResources . Designer . cs " > <nl> < AutoGen > True < / AutoGen > <nl> <nl> < / Content > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> - < Page Include = " App . xaml " > <nl> + < Page Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ App . xaml " > <nl> + < Link > App . xaml < / Link > <nl> < Generator > MSBuild : Compile < / Generator > <nl> < SubType > Designer < / SubType > <nl> < / Page > <nl> - < Page Include = " EditBox . xaml " > <nl> + < Page Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ EditBox . xaml " > <nl> + < Link > EditBox . xaml < / Link > <nl> < Generator > MSBuild : Compile < / Generator > <nl> < SubType > Designer < / SubType > <nl> < / Page > <nl> - < Page Include = " MainPage . xaml " > <nl> + < Page Include = " . . \ . . \ . . \ . . \ cocos \ platform \ wp8 - xaml \ xaml \ MainPage . xaml " > <nl> + < Link > MainPage . xaml < / Link > <nl> < Generator > MSBuild : Compile < / Generator > <nl> < SubType > Designer < / SubType > <nl> < / Page > <nl> mmm a / tests / cpp - tests / proj . wp8 - xaml / cpp - testsComponent / cpp - testsComponent . vcxproj <nl> ppp b / tests / cpp - tests / proj . wp8 - xaml / cpp - testsComponent / cpp - testsComponent . vcxproj <nl> <nl> < ClCompile Include = " . . \ . . \ Classes \ ReleasePoolTest \ ReleasePoolTest . cpp " / > <nl> < ClCompile Include = " . . \ . . \ Classes \ ShaderTest \ ShaderTest2 . cpp " / > <nl> < ClCompile Include = " . . \ . . \ Classes \ SpineTest \ SpineTest . cpp " / > <nl> + < ClCompile Include = " . . \ . . \ Classes \ Sprite3DTest \ Sprite3DTest . cpp " / > <nl> < ClCompile Include = " . . \ . . \ Classes \ TexturePackerEncryptionTest \ TextureAtlasEncryptionTest . cpp " / > <nl> < ClCompile Include = " . . \ . . \ Classes \ UITest \ CocoStudioGUITest \ CocosGUIScene . cpp " / > <nl> < ClCompile Include = " . . \ . . \ Classes \ UITest \ CocoStudioGUITest \ CocoStudioGUITest . cpp " / > <nl> <nl> < ClInclude Include = " . . \ . . \ Classes \ ReleasePoolTest \ ReleasePoolTest . h " / > <nl> < ClInclude Include = " . . \ . . \ Classes \ ShaderTest \ ShaderTest2 . h " / > <nl> < ClInclude Include = " . . \ . . \ Classes \ SpineTest \ SpineTest . h " / > <nl> + < ClInclude Include = " . . \ . . \ Classes \ Sprite3DTest \ Sprite3DTest . h " / > <nl> < ClInclude Include = " . . \ . . \ Classes \ TexturePackerEncryptionTest \ TextureAtlasEncryptionTest . h " / > <nl> < ClInclude Include = " . . \ . . \ Classes \ UITest \ CocoStudioGUITest \ CocosGUIScene . h " / > <nl> < ClInclude Include = " . . \ . . \ Classes \ UITest \ CocoStudioGUITest \ CocoStudioGUITest . h " / > <nl> mmm a / tests / cpp - tests / proj . wp8 - xaml / cpp - testsComponent / cpp - testsComponent . vcxproj . filters <nl> ppp b / tests / cpp - tests / proj . wp8 - xaml / cpp - testsComponent / cpp - testsComponent . vcxproj . filters <nl> <nl> < Filter Include = " Classes \ UITest \ CocosStudioGUITest \ UIWidgetAddNodeTest " > <nl> < UniqueIdentifier > { 085acc82 - 08d1 - 46c1 - affe - 74af030ce284 } < / UniqueIdentifier > <nl> < / Filter > <nl> + < Filter Include = " Classes \ Sprite3DTest " > <nl> + < UniqueIdentifier > { 8c7572e8 - 5643 - 4301 - b902 - ff71f0cfca2d } < / UniqueIdentifier > <nl> + < / Filter > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClCompile Include = " . . \ . . \ Classes \ AppDelegate . cpp " > <nl> <nl> < ClCompile Include = " . . \ . . \ Classes \ BugsTest \ Bug - Child . cpp " > <nl> < Filter > Classes \ BugsTest < / Filter > <nl> < / ClCompile > <nl> + < ClCompile Include = " . . \ . . \ Classes \ Sprite3DTest \ Sprite3DTest . cpp " > <nl> + < Filter > Classes \ Sprite3DTest < / Filter > <nl> + < / ClCompile > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < ClInclude Include = " . . \ . . \ Classes \ AppDelegate . h " > <nl> <nl> < ClInclude Include = " . . \ . . \ Classes \ BugsTest \ Bug - Child . h " > <nl> < Filter > Classes \ BugsTest < / Filter > <nl> < / ClInclude > <nl> + < ClInclude Include = " . . \ . . \ Classes \ Sprite3DTest \ Sprite3DTest . h " > <nl> + < Filter > Classes \ Sprite3DTest < / Filter > <nl> + < / ClInclude > <nl> < / ItemGroup > <nl> < ItemGroup > <nl> < None Include = " . . \ . . \ . . \ . . \ external \ curl \ prebuilt \ wp8 \ arm \ libcurl . dll " / > <nl> mmm a / tools / tolua / cocos2dx . ini <nl> ppp b / tools / tolua / cocos2dx . ini <nl> skip = Node : : [ setGLServerState description getUserObject . * UserData getGLServerS <nl> Component : : [ serialize ] , <nl> Console : : [ addCommand ] , <nl> ParallaxNode : : [ getParallaxArray ] , <nl> - TileMapAtlas : : [ getTGAInfo ] <nl> + TileMapAtlas : : [ getTGAInfo ] , <nl> + Sprite3D : : [ getMesh ] <nl> <nl> rename_functions = SpriteFrameCache : : [ addSpriteFramesWithFile = addSpriteFrames getSpriteFrameByName = getSpriteFrame ] , <nl> ProgressTimer : : [ setReverseProgress = setReverseDirection ] , <nl>
|
Squashed commit of the following :
|
cocos2d/cocos2d-x
|
6461e26c9f19e9f3c1aaf22cd018d6d3e211b341
|
2014-05-18T21:49:16Z
|
mmm a / ChangeLog <nl> ppp b / ChangeLog <nl> <nl> + 2010 - 04 - 12 : Version 2 . 2 . 2 <nl> + <nl> + Introduced new profiler API . <nl> + <nl> + Fixed random number generator to produce full 32 random bits . <nl> + <nl> + <nl> 2010 - 04 - 06 : Version 2 . 2 . 1 <nl> <nl> Debugger improvements . <nl> mmm a / src / version . cc <nl> ppp b / src / version . cc <nl> <nl> / / cannot be changed without changing the SCons build script . <nl> # define MAJOR_VERSION 2 <nl> # define MINOR_VERSION 2 <nl> - # define BUILD_NUMBER 2 <nl> + # define BUILD_NUMBER 3 <nl> # define PATCH_LEVEL 0 <nl> # define CANDIDATE_VERSION true <nl> <nl>
|
Prepare push of version 2 . 2 . 2 to trunk .
|
v8/v8
|
548ab99f38a7528ea8c3a1512dbc3eefa6653fb2
|
2010-04-12T11:11:28Z
|
mmm a / test / webpage - spec . js <nl> ppp b / test / webpage - spec . js <nl> describe ( " WebPage object " , function ( ) { <nl> } ) ; <nl> } ) ; <nl> <nl> - it ( " should interrupt a long - running JavaScript code " , function ( ) { <nl> + xit ( " should interrupt a long - running JavaScript code " , function ( ) { <nl> var page = new WebPage ( ) ; <nl> + var longRunningScriptCalled = false ; <nl> + var loadStatus ; <nl> <nl> page . onLongRunningScript = function ( ) { <nl> page . stopJavaScript ( ) ; <nl> + longRunningScriptCalled = true ; <nl> } ; <nl> + page . onError = function ( ) { } ; <nl> <nl> - page . open ( ' . . / test / webpage - spec - frames / forever . html ' , function ( status ) { <nl> - expect ( status ) . toEqual ( ' success ' ) ; <nl> + runs ( function ( ) { <nl> + page . open ( ' . . / test / webpage - spec - frames / forever . html ' , <nl> + function ( status ) { loadStatus = status ; } ) ; <nl> + } ) ; <nl> + waits ( 5000 ) ; <nl> + runs ( function ( ) { <nl> + expect ( loadStatus ) . toEqual ( ' success ' ) ; <nl> + expect ( longRunningScriptCalled ) . toBeTruthy ( ) ; <nl> } ) ; <nl> } ) ; <nl> } ) ; <nl> xdescribe ( " WebPage render image " , function ( ) { <nl> content = fs . read ( TEST_FILE , " b " ) ; <nl> <nl> fs . remove ( TEST_FILE ) ; <nl> - } catch ( e ) { console . log ( e ) } <nl> + } catch ( e ) { jasmine . fail ( e ) } <nl> <nl> / / for PDF test <nl> if ( format = = = " pdf " ) { <nl> mmm a / test / webserver - spec . js <nl> ppp b / test / webserver - spec . js <nl> function checkRequest ( request , response ) { <nl> if ( expectedPostData ! = = false ) { <nl> expect ( request . method ) . toEqual ( " POST " ) ; <nl> expect ( request . hasOwnProperty ( ' post ' ) ) . toBeTruthy ( ) ; <nl> - console . log ( " request . post = > " + JSON . stringify ( request . post , null , 4 ) ) ; <nl> - console . log ( " expectedPostData = > " + JSON . stringify ( expectedPostData , null , 4 ) ) ; <nl> - console . log ( " request . headers = > " + JSON . stringify ( request . headers , null , 4 ) ) ; <nl> + jasmine . log ( " request . post = > " + JSON . stringify ( request . post , null , 4 ) ) ; <nl> + jasmine . log ( " expectedPostData = > " + JSON . stringify ( expectedPostData , null , 4 ) ) ; <nl> + jasmine . log ( " request . headers = > " + JSON . stringify ( request . headers , null , 4 ) ) ; <nl> if ( request . headers [ " Content - Type " ] & & request . headers [ " Content - Type " ] = = = " application / x - www - form - urlencoded " ) { <nl> expect ( typeof request . post ) . toEqual ( ' object ' ) ; <nl> expect ( request . post ) . toEqual ( expectedPostData ) ; <nl>
|
Eliminate console spam during normal test execution .
|
ariya/phantomjs
|
7102e87bf47f7ebc77ee82c35490c1e0aaf0e1c7
|
2014-08-20T03:24:27Z
|
mmm a / Code / CryEngine / CryAction / CMakeLists . txt <nl> ppp b / Code / CryEngine / CryAction / CMakeLists . txt <nl> add_sources ( " CryAction_flashui_uber . cpp " <nl> " FlashUI / FlashUIBaseNode . h " <nl> " FlashUI / FlashUIDisplayNodes . h " <nl> " FlashUI / FlashUIElement . h " <nl> + " FlashUI / FlashUIFlowNodeFactory . h " <nl> " FlashUI / FlashUIElementNodes . h " <nl> " FlashUI / FlashUIEventNodes . h " <nl> " FlashUI / FlashUIEventSystem . h " <nl> mmm a / Code / CryEngine / CryAction / FlashUI / FlashUI . cpp <nl> ppp b / Code / CryEngine / CryAction / FlashUI / FlashUI . cpp <nl> template < EUIObjectType T > bool IsTemplate ( ) { return false ; <nl> template < > bool IsTemplate < eUOT_MovieClipTmpl > ( ) { return true ; } <nl> <nl> template < EUIObjectType Type , class Item > <nl> - static void CreateMCFunctionNodes ( std : : vector < CFlashUiFlowNodeFactory * > & nodelist , IUIElement * pElement , Item * pItem , const string & path , bool fill = false ) <nl> + static void CreateMCFunctionNodes ( CFlashUiFlowNodeFactory_AutoArray & nodelist , IUIElement * pElement , Item * pItem , const string & path , bool fill = false ) <nl> { <nl> / / prevent to fill " first row " <nl> if ( fill ) <nl> mmm a / Code / CryEngine / CryAction / FlashUI / FlashUI . h <nl> ppp b / Code / CryEngine / CryAction / FlashUI / FlashUI . h <nl> <nl> # include < CryGame / IGameFramework . h > <nl> # include < ILevelSystem . h > <nl> # include " FlashUIEventSystem . h " <nl> + # include " FlashUIFlowNodeFactory . h " <nl> <nl> # if ! defined ( _RELEASE ) | | defined ( RELEASE_LOGGING ) <nl> # define UIACTION_LOGGING <nl> class CFlashUI <nl> CRYGENERATE_SINGLETONCLASS_GUID ( CFlashUI , " FlashUI " , " 35ae7f0f - bb13 - 437b - 9c5f - fcd2568616a5 " _cry_guid ) <nl> <nl> CFlashUI ( ) ; <nl> - virtual ~ CFlashUI ( ) { } <nl> + virtual ~ CFlashUI ( ) = default ; <nl> <nl> public : <nl> / / IFlashUI <nl> class CFlashUI <nl> typedef std : : vector < std : : shared_ptr < IFlashPlayer > > TPlayerList ; <nl> TPlayerList m_loadtimePlayerList ; <nl> <nl> - std : : vector < CFlashUiFlowNodeFactory * > m_UINodes ; <nl> + CFlashUiFlowNodeFactory_AutoArray m_UINodes ; <nl> <nl> typedef std : : map < ITexture * , string > TTextureMap ; <nl> TTextureMap m_preloadedTextures ; <nl> mmm a / Code / CryEngine / CryAction / FlashUI / FlashUIBaseNode . h <nl> ppp b / Code / CryEngine / CryAction / FlashUI / FlashUIBaseNode . h <nl> class CFlashUIBaseElementNode : public CFlashUIBaseNodeDynPorts <nl> IUIElement * m_pElement ; <nl> } ; <nl> <nl> - / / FlowNode factory class for Flash UI nodes <nl> - class CFlashUiFlowNodeFactory : public IFlowNodeFactory <nl> - { <nl> - public : <nl> - CFlashUiFlowNodeFactory ( const char * sClassName , IFlowNodePtr pFlowNode ) : m_sClassName ( sClassName ) , m_pFlowNode ( pFlowNode ) { } <nl> - IFlowNodePtr Create ( IFlowNode : : SActivationInfo * pActInfo ) { return m_pFlowNode - > Clone ( pActInfo ) ; } <nl> - void GetMemoryUsage ( ICrySizer * s ) const { SIZER_SUBCOMPONENT_NAME ( s , " CFlashUiFlowNodeFactory " ) ; } <nl> - void Reset ( ) { } <nl> - <nl> - const char * GetNodeTypeName ( ) const { return m_sClassName ; } <nl> - <nl> - private : <nl> - const char * m_sClassName ; <nl> - IFlowNodePtr m_pFlowNode ; <nl> - } ; <nl> - <nl> - TYPEDEF_AUTOPTR ( CFlashUiFlowNodeFactory ) ; <nl> - typedef CFlashUiFlowNodeFactory_AutoPtr CFlashUiFlowNodeFactoryPtr ; <nl> - <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> / / mmmmmmmmmmmm UI Stack for UI Action nodes mmmmmmmmmmmmmmmmmmmmm <nl> / / mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm <nl> new file mode 100644 <nl> index 0000000000 . . d20dee8a05 <nl> mmm / dev / null <nl> ppp b / Code / CryEngine / CryAction / FlashUI / FlashUIFlowNodeFactory . h <nl> <nl> + # pragma once <nl> + <nl> + # include " CryFlowGraph / IFlowSystem . h " <nl> + <nl> + / / FlowNode factory class for Flash UI nodes <nl> + class CFlashUiFlowNodeFactory : public IFlowNodeFactory <nl> + { <nl> + public : <nl> + CFlashUiFlowNodeFactory ( const char * sClassName , IFlowNodePtr pFlowNode ) : m_sClassName ( sClassName ) , m_pFlowNode ( pFlowNode ) { } <nl> + IFlowNodePtr Create ( IFlowNode : : SActivationInfo * pActInfo ) { return m_pFlowNode - > Clone ( pActInfo ) ; } <nl> + void GetMemoryUsage ( ICrySizer * s ) const { SIZER_SUBCOMPONENT_NAME ( s , " CFlashUiFlowNodeFactory " ) ; } <nl> + void Reset ( ) { } <nl> + <nl> + const char * GetNodeTypeName ( ) const { return m_sClassName ; } <nl> + <nl> + private : <nl> + const char * m_sClassName ; <nl> + IFlowNodePtr m_pFlowNode ; <nl> + } ; <nl> + <nl> + TYPEDEF_AUTOPTR ( CFlashUiFlowNodeFactory ) ; <nl> + typedef CFlashUiFlowNodeFactory_AutoPtr CFlashUiFlowNodeFactoryPtr ; <nl> + <nl> + <nl>
|
! B ( FlashUI ) Fix deallocation order of Flash objects
|
CRYTEK/CRYENGINE
|
aa3799bb603f45e2aff3ebad0937fdbe708fbff3
|
2018-08-09T16:04:12Z
|
mmm a / src / request_handler / txt_memcached_handler . cc <nl> ppp b / src / request_handler / txt_memcached_handler . cc <nl> <nl> # define RETRIEVE_TERMINATOR " END \ r \ n " <nl> # define BAD_BLOB " CLIENT_ERROR bad data chunk \ r \ n " <nl> # define TOO_LARGE " SERVER_ERROR object too large for cache \ r \ n " <nl> + # define MAX_COMMAND_SIZE 100 <nl> <nl> # define MAX_STATS_REQ_LEN 100 <nl> <nl> txt_memcached_handler_t : : parse_result_t txt_memcached_handler_t : : parse_request ( e <nl> } <nl> <nl> / / Find the first line in the buffer <nl> - / / This is only valid if we are not reading binary data <nl> + / / This is only valid if we are not reading binary data ( we ' re reading for a command ) <nl> char * line_end = ( char * ) memchr ( conn_fsm - > rbuf , ' \ n ' , conn_fsm - > nrbuf ) ; <nl> if ( line_end = = NULL ) { / / make sure \ n is in the buffer <nl> - return request_handler_t : : op_partial_packet ; <nl> + if ( conn_fsm - > nrbuf > MAX_COMMAND_SIZE ) { <nl> + conn_fsm - > consume ( MAX_COMMAND_SIZE ) ; <nl> + return malformed_request ( ) ; <nl> + } else { <nl> + return request_handler_t : : op_partial_packet ; <nl> + } <nl> } <nl> unsigned int line_len = line_end - conn_fsm - > rbuf + 1 ; <nl> <nl>
|
Fix bug with \ n free strings .
|
rethinkdb/rethinkdb
|
62e1748ac519dbe6659d8e1184310509105391f9
|
2010-10-06T19:00:13Z
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.